Merge branch '4293-node-manager-timed-bootstrap-wip'
authorBrett Smith <brett@curoverse.com>
Wed, 10 Dec 2014 13:04:08 +0000 (08:04 -0500)
committerBrett Smith <brett@curoverse.com>
Wed, 10 Dec 2014 13:04:39 +0000 (08:04 -0500)
commit8141501a6ef0a3cf4f40da14671c31c0257472e4
treeaa9cdfbc238cd03384d92028bf8ed8b352ff5184
parent8453812fac25bae327b8fa52c5a920b1d921e8be
parentdd47cf79c71bb4cc5b90f3752d0b79110278e197
Merge branch '4293-node-manager-timed-bootstrap-wip'

Closes #4293, #4732.  Refs #4380.