Merge branch '7667-node-manager-logging' refs #7667
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 8 Feb 2016 16:28:53 +0000 (11:28 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 8 Feb 2016 16:28:53 +0000 (11:28 -0500)

Trivial merge