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.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.
internal-api
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
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
Magnus Ahltorp
2015-04-10
1
-1
/
+3
*
Verify that database entry actually contains the certificate
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
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
map-external-merge2
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