Merge branch '7435-node-manager-shutdown-cleanup-wip'
authorBrett Smith <brett@curoverse.com>
Wed, 7 Oct 2015 14:54:08 +0000 (10:54 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 7 Oct 2015 14:54:08 +0000 (10:54 -0400)
commit71db992331f357fdb3a4fdbca42a9952b7e9ae2c
tree8fca11e8460fb66741e3682a8eaff67ef4a88703
parent05b52b297b30d075ef2409a123f7d096c1156cf8
parent053de78cd0599647dfc40bff3252d2f17d959217
Merge branch '7435-node-manager-shutdown-cleanup-wip'

Closes #7435, #7445.