Merge branch '4139-blocking-node-manager-tests-wip'
authorBrett Smith <brett@curoverse.com>
Tue, 14 Oct 2014 14:19:41 +0000 (10:19 -0400)
committerBrett Smith <brett@curoverse.com>
Tue, 14 Oct 2014 14:20:28 +0000 (10:20 -0400)
commit6bdfed00c27c6034ffe4ad79a05bc9cadd9b9489
treec76bc52bd6917138219ccdddf423563e87430509
parentff9d78bbeb09ca917f0814c6055c47db5a4e7e4a
parent38ba0794f37ce5324a246a9ca5c0ac81e281e0da
Merge branch '4139-blocking-node-manager-tests-wip'

Refs #2881, #4139.  Closes #4184.