From: Brett Smith <brett@curoverse.com>
Date: Tue, 9 Jun 2015 14:26:44 +0000 (-0400)
Subject: Merge branch '6152-compute-node-no-arv-wip'
X-Git-Tag: 1.1.0~1564
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/456967e1991ea8adc30038b60f5c34703b47b694?hp=456967e1991ea8adc30038b60f5c34703b47b694

Merge branch '6152-compute-node-no-arv-wip'

Closes #6152, #6256.
---