user/linus/catlfish.git, branch pmerge-rebased Linus' CT repository Add documentation. 2015-11-10T11:48:47+00:00 Linus Nordberg linus@nordu.net 2015-11-10T11:44:08+00:00 6e7f0485d8e42278942d64569c19f2b9f504e11a 






Quote '$@' in shell script.
2015-11-10T11:48:47+00:00

Linus Nordberg
linus@nordu.net

2015-10-05T13:50:07+00:00

5980ad90b48623afb0c6135339fa6e5b1191d752












Add missing testcert and root.
2015-11-10T11:48:47+00:00

Linus Nordberg
linus@nordu.net

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

9bc52a0c6da2a728bc4d10bb5fc18c332261c391












Add a test for when merge backup fails.
2015-11-10T11:48:47+00:00

Linus Nordberg
linus@nordu.net

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

87e5dd2bfd293f229bab472e946ef12580facf6c

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-11-10T11:48:47+00:00

Linus Nordberg
linus@nordu.net

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

5825db44c73510e71e34f020e3efd03bd49ffd0c

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-11-10T11:48:47+00:00

Linus Nordberg
linus@nordu.net

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

67e2935f90f89ecc93dc98c430148829ad3f2908












Cosmetic.
2015-11-10T11:48:47+00:00

Linus Nordberg
linus@nordu.net

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

0927be7926df22ccde907a445c198e1e7d5f53a0












Add ERLANGNODES to (generated) test.mk.
2015-11-10T11:48:47+00:00

Linus Nordberg
linus@nordu.net

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

302c45616c3accb22d7e84530da6be17adf2dc8d

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-11-10T11:48:46+00:00

Linus Nordberg
linus@nordu.net

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

aaed8aff7c425c8ac2a15e584e24317da327f5e4

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-11-10T11:48:46+00:00

Linus Nordberg
linus@nordu.net

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

ab327d88f7a8f458b6150efd6b21b5615210e571