index
:
user/linus/catlfish.git
CATLFISH-50
CATLFISH-69
CATLFISH-80
CATLFISH-98
certtools-whitespace
copyright
copyright-kth
dnssec
dnssec2
doc
docker
docker-merge
docker2
docker3
docker4
encode-extra-data
erlmerge
erlmerge2
erlmerge_backup
erlmerge_dist
erlmerge_sth
extmerge
gaol
gaol2
gaol3
gaol4
gaol5
gaol6
getconfig
internal-api
maint-0.10
map-external-merge2
master
onion
onion2
parametrise_url
plop-if-cleanup
plop-if-cleanup2
pmerge
pmerge-rebased
pmerge2
pmerge2-rebased
precert
releng010
validate-certchain
validate_certchain
Linus' CT repository
Linus Nordberg
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
tools
/
merge_backup.py
Commit message (
Expand
)
Author
Age
Files
Lines
*
Dedup log initialisation code.
Linus Nordberg
2016-11-28
1
-6
/
+1
*
Parallelise merge_backup.
Linus Nordberg
2016-11-27
1
-45
/
+94
*
Manual rebase onto master with map/robust-distribution.
Linus Nordberg
2016-11-25
1
-50
/
+71
*
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