user/map/catlfish.git - Magnus' CT repository

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move hardcoded merge parameters to command line	Magnus Ahltorp	2015-01-28	1	-12/+16
\|
*	merge.py: add call to storage/getentry since fetchnewentries no longer gives ↵	Magnus Ahltorp	2015-01-28	1	-2/+18
\| \| \| \|	us the actual entry
*	Merge remote-tracking branch 'refs/remotes/map/external-merge3' into ↵	Linus Nordberg	2014-10-29	1	-4/+53
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merging-external-merge Conflicts: src/v1.erl tools/merge.py tools/testcase1.py
\| *	merge.py: send whole sth in sendsth call	Magnus Ahltorp	2014-10-27	1	-1/+26
\| \|
\| *	Handle missing entries in merge	Magnus Ahltorp	2014-10-27	1	-2/+26
\| \|
\| *	System tests for external merge	Magnus Ahltorp	2014-10-24	1	-1/+1
\| \|
\| *	Added external merging support	Magnus Ahltorp	2014-10-24	1	-0/+133
\|
*	Copyright NORDUnet.	Linus Nordberg	2014-10-29	1	-2/+2
\|
*	Added external merging support	Magnus Ahltorp	2014-10-29	1	-0/+133