From: Brett Smith <brett@curoverse.com>
Date: Wed, 12 Nov 2014 18:59:14 +0000 (-0500)
Subject: Merge branch '4380-node-manager-computenode-reorg-wip'
X-Git-Tag: 1.1.0~2005
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/8f9f0dece977ccf5a778f3b3bd2379375e723c18?hp=-c

Merge branch '4380-node-manager-computenode-reorg-wip'

Refs #4380.  Closes #4496.
---

8f9f0dece977ccf5a778f3b3bd2379375e723c18