From: Tom Clegg <tom@curoverse.com>
Date: Fri, 6 Feb 2015 22:30:31 +0000 (-0500)
Subject: Merge branch '3021-leave-api-running' refs #3021
X-Git-Tag: 1.1.0~1838
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/afef0760e7281eb7038778a12575dfc32b3162f3?hp=-c

Merge branch '3021-leave-api-running' refs #3021
---

afef0760e7281eb7038778a12575dfc32b3162f3