diff options
| author | Linus Nordberg <linus@nordu.net> | 2015-09-24 16:47:32 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2015-11-10 12:48:46 +0100 |
| commit | aaed8aff7c425c8ac2a15e584e24317da327f5e4 (patch) | |
| tree | 229a7e5718b0d4c9750918d654484dba354f5194 /tools/merge | |
| parent | ab327d88f7a8f458b6150efd6b21b5615210e571 (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 'tools/merge')
| -rwxr-xr-x | tools/merge | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/merge b/tools/merge new file mode 100755 index 0000000..e11ac93 --- /dev/null +++ b/tools/merge @@ -0,0 +1,8 @@ +#! /bin/sh + +BINDIR=$(dirname $0) + +$BINDIR/merge_fetch.py $@ +$BINDIR/merge_backup.py $@ +$BINDIR/merge_sth.py $@ +$BINDIR/merge_dist.py $@ |