projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b2b4e7 6d31c84)
Merge branch '1579-keep-server-in-docker' of git.clinicalfuture.com:arvados into...
authorTim Pierce <twp@clinicalfuture.com>
Thu, 14 Nov 2013 17:35:48 +0000 (12:35 -0500)
committerTim Pierce <twp@clinicalfuture.com>
Thu, 14 Nov 2013 17:35:48 +0000 (12:35 -0500)
Rebasing 1579-keep-server-in-docker from 1578-api-server-in-docker
(which has much better Docker support to work from).


Trivial merge