Merge branch 'master' into 4138-node-manager-google-cloud
authorTim Pierce <twp@curoverse.com>
Tue, 6 Jan 2015 17:25:13 +0000 (12:25 -0500)
committerTim Pierce <twp@curoverse.com>
Tue, 6 Jan 2015 17:25:13 +0000 (12:25 -0500)
commitbff57ea5cd61b02b829d831e3637151b1cf4b94c
tree4c95209913a4a0bcd8619dbda25c565ab9738c08
parent271294ffc7ef53389959921589d679cb2b4065ce
parent9013faf477b5862cb915f1d80148daffa795cc89
Merge branch 'master' into 4138-node-manager-google-cloud
services/nodemanager/doc/ec2.example.cfg