user/linus/catlfish.git - Linus' CT repository

	Commit message (Collapse)	Author	Age	Files	Lines
*	Parallelise merge_fetch.py.	Linus Nordberg	2016-11-25	1	-6/+8
\| \| \| \| \| \| \|	NOTE: Not supporting permdb yet! We're still not passing the tests because merge_backup.py exits when the secondary merge disappears.
*	WIP	Linus Nordberg	2016-11-23	1	-0/+56
	Merge can run as four separate processes, plus a fifth controlling proces 'merge'. Tests are limited to testcase1.py and they're failing because of the test with the dead merge secondary. Tests are also time consuming because they're waiting for 60s each time a merge needs to be verified. This could be improved by peeking at the control files, for example.