user/linus/catlfish.git/tools/merge, branch master Linus' CT repository Parallelised merge, sth phase. 2017-02-07T13:41:59+00:00 Linus Nordberg linus@nordu.net 2017-02-07T13:41:59+00:00 71cc72d3c5e977355ebb0aa8bcb065a08207ec2f 






Parallelised merge, backup phase.
2017-02-02T01:47:49+00:00

Linus Nordberg
linus@nordu.net

2017-02-02T01:47:49+00:00

6610afbf6a5e802fc15733d6a499281cd981af13












Parallelised merge, distribution phase.
2017-02-01T10:24:28+00:00

Linus Nordberg
linus@nordu.net

2017-01-24T08:16:28+00:00

b7b8903b6a7c3342933b9984afa72fb6527b5f72












Test failing merge backup
2016-10-14T14:54:57+00:00

Magnus Ahltorp
map@kth.se

2016-10-14T14:54:57+00:00

c8af4e40e0096f60a5cf5039be775ff002619c4d

Refactor tests





Refactor tests







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

Linus Nordberg
linus@nordu.net

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

5980ad90b48623afb0c6135339fa6e5b1191d752












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