summaryrefslogtreecommitdiff
path: root/merge/src/merge_util.erl
Commit message (Expand)AuthorAgeFilesLines
* Added heartbeat service. Add source. Send better messages.Magnus Ahltorp2017-03-081-27/+27
* StatusserverMagnus Ahltorp2017-03-081-0/+4
* Use map() rather than a list comprehension.dist-debugLinus Nordberg2017-02-271-1/+1
* Whitespace.Linus Nordberg2017-02-271-1/+2
* Simplify added error handling.Linus Nordberg2017-02-231-8/+6
* Fix error printout.Linus Nordberg2017-02-231-1/+1
* Add debug printouts and error handling.Linus Nordberg2017-02-231-6/+17
* Do do missingentries in merge dist.Linus Nordberg2017-02-081-1/+11
* merge_backup: Do not read logorder past what fetched indicates.erlmerge_sthLinus Nordberg2017-02-081-7/+25
* Parallelised merge, sth phase.Linus Nordberg2017-02-071-0/+25
* Parallelised merge, backup phase.Linus Nordberg2017-02-021-0/+74