Commit graph

10 commits

Author SHA1 Message Date
James Cammarata
d9c460ed07 Merge branch 'rb2' of https://github.com/bpennypacker/ansible into bpennypacker-rb2
Conflicts:
	library/cloud/route53
2013-08-23 11:36:45 -05:00
Joshua Lund
fe5154f0c6 Fixing typo in EC2 modules 2013-08-21 18:13:05 -06:00
Bruce Pennypacker
11470fea04 Rebase attempt
No idea if I'm rebasing properly or not.  This is my first attempt.
2013-08-20 15:14:16 -04:00
Michael DeHaan
5c8e5c81de Fix YAML doc errors. 2013-07-21 11:15:06 -04:00
Evan Duffield
c9cd296a09 added note about AMI security 2013-07-08 10:24:22 -07:00
Evan Duffield
56471c52a1 Merge branch 'devel' of https://github.com/evan82/ansible into devel 2013-07-08 09:26:04 -07:00
Evan Duffield
dcc850dccf added region to spec 2013-07-08 09:24:18 -07:00
Evan
eaa9233cc8 Getting timeout errors this morning as AMIs are taking a bit longer to create, so I changed to timeout to 15 minutes 2013-07-03 11:10:39 -07:00
Evan
200f69f9d5 fixed spelling errors, unused variables and unused import 2013-07-03 10:35:32 -07:00
Evan Duffield
dca20ca508 Added module for baking EC2 AMIs 2013-07-02 11:24:40 -07:00