summaryrefslogtreecommitdiff
path: root/merge
Commit message (Expand)AuthorAgeFilesLines
* Ready for 0.10.1.Linus Nordberg2017-02-111-1/+1
* Ready for plop-0.10.0, for real this time.Linus Nordberg2017-02-111-1/+1
* Move a spammy log entry from info to debug.Linus Nordberg2017-02-111-2/+2
* Don't divide merge_delay with 60 in merge_sth.Linus Nordberg2017-02-111-1/+1
* Always load the tree before getting the root.load_treeLinus Nordberg2017-02-101-3/+6
* Do do missingentries in merge backup.erlmerge2Linus Nordberg2017-02-081-1/+3
* Remove invalid case where fetched file contains < -1.Linus Nordberg2017-02-081-2/+0
* Do do missingentries in merge dist.Linus Nordberg2017-02-082-2/+14
* DebugTags in http requests are io_lib:chars(), not flat lists.Linus Nordberg2017-02-082-2/+2
* Restructure code to look more like dist.Linus Nordberg2017-02-081-4/+4
* Make merge dist workers one_for_one.Linus Nordberg2017-02-082-21/+17
* merge_backup: Do not read logorder past what fetched indicates.erlmerge_sthLinus Nordberg2017-02-083-40/+29
* Don't use 'if' after all.Linus Nordberg2017-02-081-5/+3
* Use the minsize file.Linus Nordberg2017-02-072-3/+9
* Add missing file.Linus Nordberg2017-02-071-0/+172
* Parallelised merge, sth phase.Linus Nordberg2017-02-073-28/+31
* Add a bit of status and debug printout.Linus Nordberg2017-02-061-2/+6
* Parallelised merge, backup phase.Linus Nordberg2017-02-025-78/+278
* Parallelised merge, distribution phase.erlmerge_distLinus Nordberg2017-02-015-0/+266