user/linus/catlfish.git/tools, branch pmerge Linus' CT repository Quote '$@' in shell script. 2015-10-05T13:50:07+00:00 Linus Nordberg linus@nordu.net 2015-10-05T13:50:07+00:00 edf75baed3ddf135cd5eb267b313435a289ab35b 






Add missing testcert and root.
2015-09-25T18:09:19+00:00

Linus Nordberg
linus@nordu.net

2015-09-25T18:09:19+00:00

68ce3c508c16ce1cdfbfa928ae0494cca1bdc0ce












Add a test for when merge backup fails.
2015-09-25T17:49:39+00:00

Linus Nordberg
linus@nordu.net

2015-09-25T17:49:39+00:00

5e01a05f5b0e8d71437ba4267db6aa3784a12a52

Also, avoid tracebacks on ECONNREFUSED by catching urrllib2.URLError.





Also, avoid tracebacks on ECONNREFUSED by catching urrllib2.URLError.







merge_backup.py and merge_dist.py take nodes on command line.
2015-09-25T14:26:42+00:00

Linus Nordberg
linus@nordu.net

2015-09-25T14:26:42+00:00

300149c520921523f107537be5a3bb20fed829f0

If no nodes are given on the command line, all appropriate nodes are
used.





If no nodes are given on the command line, all appropriate nodes are
used.







Fix backup-quorum-size and use it.
2015-09-24T16:20:18+00:00

Linus Nordberg
linus@nordu.net

2015-09-24T16:20:18+00:00

02ab9ba3b43d7d42323db2effd787a0dce64e378












Cosmetic.
2015-09-24T14:48:51+00:00

Linus Nordberg
linus@nordu.net

2015-09-24T14:48:51+00:00

77475e45b7d1b64bbf0d1193fc1faa1eabfe5b17












Add ERLANGNODES to (generated) test.mk.
2015-09-24T14:48:36+00:00

Linus Nordberg
linus@nordu.net

2015-09-24T14:48:36+00:00

9c7442d0b203ef68f03cf3962d88e7fe8c0611f3

merge-1 is a NODE but doesn't have an erl(1) instance.





merge-1 is a NODE but doesn't have an erl(1) instance.







Merge is now run by shell script tools/merge.
2015-09-24T14:47:32+00:00

Linus Nordberg
linus@nordu.net

2015-09-24T14:47:32+00:00

37cab78a89a4e6f7ec29c1cde1e68dfc5c46bd9d

tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and
merge_dist.py sequentially.

TODO: test backupquorum != 0





tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and
merge_dist.py sequentially.

TODO: test backupquorum != 0







Lint nits.
2015-09-22T20:54:21+00:00

Linus Nordberg
linus@nordu.net

2015-09-22T20:54:21+00:00

98c4ab09dd0f04bd3aa5567fcfb05cbb6a3a75f1












Get the imports correct.
2015-09-22T20:54:11+00:00

Linus Nordberg
linus@nordu.net

2015-09-22T20:54:11+00:00

92e58c735a30e0363e52972431d9904c1ee6f88e