summaryrefslogtreecommitdiff
path: root/test/scripts/continuous-merge-test.sh
Commit message (Collapse)AuthorAgeFilesLines
* merge_sth: Don't try to go back in time.Linus Nordberg2016-12-031-1/+2
| | | | | | | | | | | Due to a recent change in get_nfetched(), merge_sth lacking the 'sth' file could go back to a tree size of zero. It's rejected by frontend nodes with a newer tree, but it's still a severe error to produce that piece of data. We add tools/initlog.py which creates an 'sth' file with tree size 0 and have tests invoke it after starting the erlang nodes, before starting the continous merge processes.
* Manual rebase onto master with map/robust-distribution.Linus Nordberg2016-11-251-0/+27