index
:
user/map/catlfish.git
CATLFISH-102
authentication
authentication2
bench
benchreport
better-start-stop
better-start-stop-2
bindaddress
cagen
catlfish-74
catlfish-78
cert7
check-sth
check-sth2
check-sth3
cleanup-tests
compileconfig
compileconfig2
config-api-key
consproof
convertdb
docgen
docgen2
docgen3
docgen4
entryhash-merge
erlmerge_backup_keymgmt
experimental-new-dist
external-merge
external-merge-rebased
external-merge2
external-merge3
extsign
frontendverify
fsync4
fsynclogorder
genauthkeys
hackney
hackney-merge
hsmhelper
key-management
key-management2
large-body
large-tests
large-tests2
large-tests3
large-tests4
large-tests5
master
mergeprogress
mergesecondary
mergesecondary-prel
mergesignfailover
mergeverify
mergeverify2
mochiweb
multisign
nopublicssl
nopublicssl2
nopublicssl3
perftest-fix
permdb
permdb-config
permdb2
plop-if-cleanup
plopstoragefix
precert-storage-fix
precertsubmit
python-requests
python-requests-chunked
ratelimit
refactor-tests
releasemanagement
releasemanagement2
releasemanagement3
reloadable-config
reltool-fix
removejiffy
robust-distribution
sendsth
sendsth-verified
sslverify
sslworkaroundremove
statusserver
sthfresh
storage-signature
storagegc
storagegc2
submission-fix
submitcertfix
testtools
testtools2
testtools3
testtools4
Magnus' CT repository
Magnus Ahltorp
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
tools
/
merge.py
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge is now run by shell script tools/merge.
Linus Nordberg
2015-11-10
1
-38
/
+0
*
Split merge.py into three pieces.
Linus Nordberg
2015-11-10
1
-511
/
+31
*
Follow internal HTTP API URL changes.
Linus Nordberg
2015-08-20
1
-13
/
+13
*
Wrap entries in plop wrapper
Magnus Ahltorp
2015-08-19
1
-1
/
+1
*
Set verifiedsize after merge backup is verified
Magnus Ahltorp
2015-07-31
1
-1
/
+18
*
Preliminary merge secondary support. Change merge db to lowercase.
Magnus Ahltorp
2015-07-31
1
-25
/
+152
*
Improve merge progress reporting
Magnus Ahltorp
2015-06-12
1
-44
/
+79
*
Fsync logorder in merge
fsynclogorder
Magnus Ahltorp
2015-05-22
1
-0
/
+6
*
Add remote script for merge secondary
Magnus Ahltorp
2015-04-23
1
-3
/
+6
*
Add support for merge secondaries
Magnus Ahltorp
2015-04-23
1
-53
/
+26
*
Run all types of nodes from the same docker image.
Linus Nordberg
2015-04-13
1
-3
/
+12
*
Move path to verifycert.erl to config file.
Linus Nordberg
2015-04-10
1
-1
/
+1
*
Verify SSL certificates and hostnames in python code
sslverify
Magnus Ahltorp
2015-04-10
1
-1
/
+3
*
Verify that database entry actually contains the certificate
mergeverify2
Magnus Ahltorp
2015-04-07
1
-1
/
+33
*
Retry sendlog on error
Magnus Ahltorp
2015-04-02
1
-3
/
+12
*
Cleanup tests and use urllib2.build_opener
cleanup-tests
Magnus Ahltorp
2015-03-31
1
-4
/
+12
*
Handle multiple signing nodes
Magnus Ahltorp
2015-03-27
1
-3
/
+8
*
Generate config from master config. Verify responses in merge.py.
Magnus Ahltorp
2015-03-23
1
-43
/
+49
*
Make timing printouts optional in merge.py
Magnus Ahltorp
2015-03-23
1
-2
/
+5
*
merge.py: Store certs in hashed directory structure
Magnus Ahltorp
2015-03-08
1
-2
/
+19
*
Save STH instead of calculating a new one each time.
Magnus Ahltorp
2015-03-04
1
-3
/
+12
*
merge.py: use external signing
Magnus Ahltorp
2015-03-03
1
-3
/
+2
*
Move http_request to certtools
Magnus Ahltorp
2015-03-03
1
-25
/
+10
*
Require authentication for merge calls
Magnus Ahltorp
2015-02-27
1
-10
/
+32
*
merge.py: Only ask node that actually has the entry.
Magnus Ahltorp
2015-02-20
1
-21
/
+70
*
Move hardcoded merge parameters to command line
Magnus Ahltorp
2015-02-20
1
-12
/
+16
*
merge.py: add call to storage/getentry since fetchnewentries no longer gives ...
Magnus Ahltorp
2015-02-20
1
-2
/
+18
*
Merge remote-tracking branch 'refs/remotes/map/external-merge3' into merging-...
Linus Nordberg
2014-10-29
1
-4
/
+53
|
\
|
*
merge.py: send whole sth in sendsth call
Magnus Ahltorp
2014-10-27
1
-1
/
+26
|
*
Handle missing entries in merge
Magnus Ahltorp
2014-10-27
1
-2
/
+26
|
*
System tests for external merge
Magnus Ahltorp
2014-10-24
1
-1
/
+1
|
*
Added external merging support
Magnus Ahltorp
2014-10-24
1
-0
/
+133
*
Copyright NORDUnet.
Linus Nordberg
2014-10-29
1
-2
/
+2
*
Added external merging support
Magnus Ahltorp
2014-10-29
1
-0
/
+133