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

	Commit message (Expand)	Author	Age	Files	Lines
*	Remove erroneous 'filedb' db name from python merge	Magnus Ahltorp	2017-07-26	1	-1/+1
*	Change paths/mergedb to paths/db in local config	Magnus Ahltorp	2017-07-25	1	-1/+1
*	Update copyright headers.	Linus Nordberg	2017-01-12	1	-1/+1
*	Add a bit of documentation.	Linus Nordberg	2016-11-25	1	-1/+4
*	Change algorithm for merge backup and merge dist	Magnus Ahltorp	2016-11-02	1	-84/+82
*	Send list of entries to frontend	Magnus Ahltorp	2016-11-02	1	-1/+1
*	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
* \|	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
*	Merge is now run by shell script tools/merge.	Linus Nordberg	2015-11-10	1	-7/+51
*	Split merge.py into three pieces.	Linus Nordberg	2015-11-10	1	-0/+108