summaryrefslogtreecommitdiff
path: root/packaging/docker/catlfish-dev/merge.sh
Commit message (Collapse)AuthorAgeFilesLines
* [merge] Print current time after merge has finished.Linus Nordberg2015-04-251-0/+1
| | | | Sometimes it's interesting to know how long time a merge took.
* Remove spurious printout from merge.sh.Linus Nordberg2015-04-161-2/+0
|
* Run all types of nodes from the same docker image.Linus Nordberg2015-04-131-0/+29