summaryrefslogtreecommitdiff
path: root/examples/docker-minimal/docker/known_roots
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2015-09-24 16:47:32 +0200
committerLinus Nordberg <linus@nordu.net>2015-11-10 12:48:46 +0100
commitaaed8aff7c425c8ac2a15e584e24317da327f5e4 (patch)
tree229a7e5718b0d4c9750918d654484dba354f5194 /examples/docker-minimal/docker/known_roots
parentab327d88f7a8f458b6150efd6b21b5615210e571 (diff)
Merge is now run by shell script tools/merge.
tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0
Diffstat (limited to 'examples/docker-minimal/docker/known_roots')
0 files changed, 0 insertions, 0 deletions