Commit graph

10 commits

Author SHA1 Message Date
James Cammarata
bb75050912 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
654b37f212 Fixing typo in EC2 modules 2013-08-21 18:13:05 -06:00
Bruce Pennypacker
0f458210bc 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
10f99938b9 Fix YAML doc errors. 2013-07-21 11:15:06 -04:00
Evan Duffield
7932ccef46 added note about AMI security 2013-07-08 10:24:22 -07:00
Evan Duffield
e33f5ae56e Merge branch 'devel' of https://github.com/evan82/ansible into devel 2013-07-08 09:26:04 -07:00
Evan Duffield
45bdda24db added region to spec 2013-07-08 09:24:18 -07:00
Evan
de211aa8ec 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
637a6c562e fixed spelling errors, unused variables and unused import 2013-07-03 10:35:32 -07:00
Evan Duffield
c8f8f14e59 Added module for baking EC2 AMIs 2013-07-02 11:24:40 -07:00