Merge branch 'master' into 6507-node-manager-azure
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 28 Aug 2015 14:44:32 +0000 (10:44 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 28 Aug 2015 14:44:32 +0000 (10:44 -0400)
commit29c5c69ef3c9ceadbea3085f2268bb5ed8496c04
tree2d7dedb54cf5e5df98856abcd5e465f8c8274006
parent10b25cacfc521b3dc74c2204fc2b29aca8ad2631
parent59b414ff7a625ad3d6e92659b20bdabc6d89e7d4
Merge branch 'master' into 6507-node-manager-azure