From: Ward Vandewege <ward@curoverse.com>
Date: Mon, 23 Mar 2015 20:49:46 +0000 (-0400)
Subject: Merge branch '5529-build-and-test-keepproxy-docker-image'
X-Git-Tag: 1.1.0~1059^2~6^2~191
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5cdd9c170ff4c5c3ac4c5101ee4a9ada47a4adce

Merge branch '5529-build-and-test-keepproxy-docker-image'

refs #5529
---

5cdd9c170ff4c5c3ac4c5101ee4a9ada47a4adce