summaryrefslogtreecommitdiff
path: root/packaging/docker/catlfish-merge/merge.sh
Commit message (Collapse)AuthorAgeFilesLines
* docker moarLinus Nordberg2015-04-021-1/+1
|
* Run merge.sh under supervisord.Linus Nordberg2015-04-011-6/+3
| | | | We want the log.
* Dockerfile for merge, first cut.Linus Nordberg2015-04-011-0/+30