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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added permdb support to merge	Magnus Ahltorp	2016-07-11	1	-4/+4
\|
*	Merge remote-tracking branch 'refs/remotes/map/python-requests-chunked'	Linus Nordberg	2016-07-11	1	-33/+69
\|\
\| *	bugfix: re-added fetched_entries	Magnus Ahltorp	2016-03-15	1	-0/+2
\| \|
\| *	Do detection of where log ends before sending new hashes	Magnus Ahltorp	2016-03-15	1	-33/+67
\| \| \| \| \| \| \| \|	Try to send entries until missing entries is empty
* \|	Remove debug printouts from merge programs.	Linus Nordberg	2015-11-20	1	-1/+1
\|/
*	Send many entries at a time in merge_backup	Magnus Ahltorp	2015-11-12	1	-7/+7
\|
*	Print the string "timing" and the name of the program in merge timing info.	Linus Nordberg	2015-11-10	1	-1/+1
\|
*	merge_backup.py and merge_dist.py take nodes on command line.	Linus Nordberg	2015-11-10	1	-3/+10
\| \| \| \| \|	If no nodes are given on the command line, all appropriate nodes are used.
*	Merge is now run by shell script tools/merge.	Linus Nordberg	2015-11-10	1	-7/+51
\| \| \| \| \| \| \|	tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0
*	Split merge.py into three pieces.	Linus Nordberg	2015-11-10	1	-0/+108