Merge branch 'master' into 7454-azure-custom-data
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 11 Dec 2015 19:59:02 +0000 (14:59 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 11 Dec 2015 19:59:02 +0000 (14:59 -0500)
commit0662b235357dd40b5d27efd06b60044ddcec06f6
tree9a18f7bd309427c16fb8705275d99ca810817088
parent72124442f128b2411b36c318d40d48cca9d39f4b
parent7d5d57a522489209e6b3cecfef94bab0aae4a7f5
Merge branch 'master' into 7454-azure-custom-data
services/nodemanager/arvnodeman/computenode/driver/azure.py