Merge branch '6152-compute-node-no-arv-wip'
authorBrett Smith <brett@curoverse.com>
Tue, 9 Jun 2015 14:26:44 +0000 (10:26 -0400)
committerBrett Smith <brett@curoverse.com>
Tue, 9 Jun 2015 14:29:03 +0000 (10:29 -0400)
commit456967e1991ea8adc30038b60f5c34703b47b694
tree0dc540ff0d4478f4252f1bd571595cb85438c39c
parenta9c1ba7bffe05b9231102dcad33546b39a59e823
parent6a6cd4516f0753f8bbe15265f299e83860ff7174
Merge branch '6152-compute-node-no-arv-wip'

Closes #6152, #6256.