| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Manual rebase onto master with map/robust-distribution. | Linus Nordberg | 2016-11-25 | 1 | -27/+54 |
| | | |||||
| * | Add a bit of documentation. | Linus Nordberg | 2016-11-25 | 1 | -1/+4 |
| | | |||||
| * | Merge remote-tracking branch 'refs/remotes/map/python-requests-chunked' | Linus Nordberg | 2016-07-11 | 1 | -2/+3 |
| |\ | |||||
| | * | Use python requests package instead of urllib2 | Magnus Ahltorp | 2016-03-09 | 1 | -2/+3 |
| | | | |||||
| * | | Make merge_sth work again after last commit. | Linus Nordberg | 2015-11-20 | 1 | -2/+1 |
| | | | |||||
| * | | Remove debug printouts from merge programs. | Linus Nordberg | 2015-11-20 | 1 | -2/+2 |
| |/ | |||||
| * | Print the string "timing" and the name of the program in merge timing info. | Linus Nordberg | 2015-11-10 | 1 | -1/+1 |
| | | |||||
| * | Fix backup-quorum-size and use it. | Linus Nordberg | 2015-11-10 | 1 | -3/+10 |
| | | |||||
| * | Merge is now run by shell script tools/merge. | Linus Nordberg | 2015-11-10 | 1 | -0/+123 |
| tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0 | |||||
 |
index : user/linus/catlfish.git | |
| Linus' CT repository | Linus Nordberg |
| summaryrefslogtreecommitdiff |