| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Remove erroneous 'filedb' db name from python merge | Magnus Ahltorp | 2017-07-26 | 1 | -1/+1 |
| | | |||||
| * | Change paths/mergedb to paths/db in local configdocgen2 | Magnus Ahltorp | 2017-07-25 | 1 | -1/+1 |
| | | | | | Remove unused config variable paths/publickeys | ||||
| * | Update copyright headers. | Linus Nordberg | 2017-01-12 | 1 | -1/+1 |
| | | |||||
| * | Add a bit of documentation. | Linus Nordberg | 2016-11-25 | 1 | -1/+4 |
| | | |||||
| * | Change algorithm for merge backup and merge dist | Magnus Ahltorp | 2016-11-02 | 1 | -61/+79 |
| | | |||||
| * | Send list of entries to frontend | Magnus Ahltorp | 2016-11-02 | 1 | -20/+32 |
| | | | | | Handle connection error | ||||
| * | Added permdb support to merge | Magnus Ahltorp | 2016-07-11 | 1 | -3/+3 |
| | | |||||
| * | Print the string "timing" and the name of the program in merge timing info. | Linus Nordberg | 2015-11-10 | 1 | -1/+1 |
| | | |||||
| * | Fix harmless cut'n'paste bugs in merge. | Linus Nordberg | 2015-11-10 | 1 | -5/+5 |
| | | |||||
| * | merge_backup.py and merge_dist.py take nodes on command line. | Linus Nordberg | 2015-11-10 | 1 | -3/+8 |
| | | | | | | If no nodes are given on the command line, all appropriate nodes are used. | ||||
| * | Merge is now run by shell script tools/merge. | Linus Nordberg | 2015-11-10 | 1 | -48/+54 |
| | | | | | | | | tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0 | ||||
| * | Get the imports correct. | Linus Nordberg | 2015-11-10 | 1 | -2/+2 |
| | | |||||
| * | Split merge.py into three pieces. | Linus Nordberg | 2015-11-10 | 1 | -0/+130 |
 |
index : user/map/catlfish.git | |
| Magnus' CT repository | Magnus Ahltorp |
| summaryrefslogtreecommitdiff |