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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Increase timeouts waiting for merge.	Linus Nordberg	2016-12-01	1	-3/+3
\| \| \| \| \| \| \|	Increase from 15 to 40 seconds. In theory, it should never be more than 20 seconds plus actual time to do the job with a merge interval of 10 seconds. Max wait times are 3+1 seconds in fetch, 3s in backup, 10s in sth and 3s in dist.
*	Don't need this bc don't do locking anymore.	Linus Nordberg	2016-11-26	1	-1/+0
\| \| \| \|	Also, it collides with permdb.
*	Sleep less in tests.	Linus Nordberg	2016-11-25	2	-14/+14
\|
*	Manual rebase onto master with map/robust-distribution.	Linus Nordberg	2016-11-25	6	-1/+103
\|
*	Change hard coded paths to use variables	Magnus Ahltorp	2016-11-22	1	-8/+8
\|
*	Added performance tests	Magnus Ahltorp	2016-11-02	2	-1/+72
\|
*	Test failing merge backup	Magnus Ahltorp	2016-10-14	10	-46/+92
\| \| \| \|	Refactor tests
*	Make tests run independently from cwd	Magnus Ahltorp	2016-10-13	10	-132/+139
\|
*	Specify where to source test.shvars from ('./').	Linus Nordberg	2016-10-06	10	-10/+10
\| \| \| \|	For people without '.' in PATH.
*	Move test preparation to separate shell script	Magnus Ahltorp	2016-10-05	2	-47/+89
\|
*	Move tests to shell scripts	Magnus Ahltorp	2016-10-05	9	-0/+249