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)
1  2 
services/nodemanager/doc/ec2.example.cfg