summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* We had two separate methods trying to do the same thing but neither one was c...docker-merge-hostconfig-methodsToshio Kuratomi2015-09-031-63/+26
* Make sure listener ports are ints.Toshio Kuratomi2015-09-031-2/+2
* Merge pull request #1951 from galindro/ec2_asg_termination_policiesBenno Joy2015-09-031-2/+11
|\
| * Added termination_policies optionBruno Galindro da Costa2015-08-211-2/+11
* | partially reverted previous change to deal with systemctl show status not ret...Brian Coca2015-09-021-4/+3
* | Merge pull request #2000 from jsmartin/os_server_fixJames Cammarata2015-09-021-1/+1
|\ \
| * | Adds sanity check to make sure nics is a list.James Martin2015-09-021-1/+1
|/ /
* | vm_floppy 2.0 supportCharles Paul2015-09-011-0/+1
* | Merge pull request #1996 from ansible/revert-1995-revert-1720-feature-virtual...Chrrrles Paul2015-09-011-0/+62
|\ \
| * | Revert "Add 2.0 docs - Revert "add virtual floppy to VMware guest""revert-1995-revert-1720-feature-virtual-floppyChrrrles Paul2015-09-011-0/+62
|/ /
* | Merge pull request #1995 from ansible/revert-1720-feature-virtual-floppyChrrrles Paul2015-09-011-62/+0
|\ \
| * | Revert "add virtual floppy to VMware guest"revert-1720-feature-virtual-floppyChrrrles Paul2015-09-011-62/+0
|/ /
* | check systemctl status before show as show will not return antyhing other tha...Brian Coca2015-09-011-1/+7
* | minor doc fixesBrian Coca2015-09-011-3/+5
* | Merge pull request #1720 from nivanko/feature-virtual-floppyChrrrles Paul2015-09-011-0/+62
|\ \
| * | add virtual floppy to VMware guestNikolay Ivanko2015-07-131-0/+62
* | | Merge pull request #1990 from rickmendes/usability-enhancementsBenno Joy2015-09-011-32/+43
|\ \ \
| * | | using single device_id and enabling release on disassociationRick Mendes2015-08-311-32/+43
* | | | Merge pull request #1940 from jcowley/s3-permissionsBenno Joy2015-09-011-1/+10
|\ \ \ \
| * | | | Add support for S3 canned permissions. resolves #1939Jason Cowley2015-08-191-1/+10
* | | | | Merge pull request #1989 from mgedmin/patch-1Brian Coca2015-08-311-1/+3
|\ \ \ \ \
| * | | | | authorized_key: fix example in documentationMarius Gedminas2015-08-311-1/+3
| | |/ / / | |/| | |
* | | | | Remove non-ascii quote charToshio Kuratomi2015-08-311-1/+1
|/ / / /
* | | | Merge pull request #1986 from caphrim007/add-kali-linux-support-to-hostname-m...Brian Coca2015-08-301-0/+5
|\ \ \ \
| * | | | Add hostname support for Kali linux 2.0Tim Rupp2015-08-281-0/+5
|/ / / /
* | | | Merge pull request #1982 from lowwalker/patch-2Chrrrles Paul2015-08-281-2/+7
|\ \ \ \
| * | | | updated examplesLuke2015-08-281-2/+7
* | | | | Merge pull request #1983 from lowwalker/patch-3Brian Coca2015-08-281-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | removed hyphens in module name in examplesLuke2015-08-281-2/+2
|/ / / /
* | | | Merge pull request #1703 from haad/ec2_start_stop_by_tagBenno Joy2015-08-271-36/+62
|\ \ \ \
| * | | | Rebase start/stop instance pull codeHAMSIK Adam2015-08-181-36/+62
* | | | | Merge pull request #1871 from evanccnyc/develBenno Joy2015-08-271-48/+103
|\ \ \ \ \
| * | | | | Adding the ability to associate eips with network interfacesEvan Carter2015-08-051-48/+103
* | | | | | Merge pull request #1974 from tima/rds-timeout-errBenno Joy2015-08-271-9/+9
|\ \ \ \ \ \
| * | | | | | Clarified and cleaned up grammar of error messages.Timothy Appnel2015-08-261-8/+8
| * | | | | | Fixed call to undefined attribute when RDS module timeouts waiting.Timothy Appnel2015-08-261-1/+1
* | | | | | | Merge pull request #1969 from mgedmin/fix-1678Benno Joy2015-08-271-2/+2
|\ \ \ \ \ \ \
| * | | | | | | apt: check for "0 upgraded" to be at the beginning of the lineMarius Gedminas2015-08-251-2/+2
* | | | | | | | Merge pull request #1973 from mgedmin/user-no-ssh-keygen-in-check-modeBenno Joy2015-08-271-1/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | user: don't generate SSH keys in check modeMarius Gedminas2015-08-261-1/+6
| |/ / / / / /
* | | | | | | Merge pull request #1952 from manics/authorized_key-check_mode-user_pathBrian Coca2015-08-261-6/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Don't fail in check_mode if user existsSimon Li2015-08-211-6/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1915 from leedm777/patch-1Brian Coca2015-08-241-0/+1
|\ \ \ \ \ \
| * | | | | | ec2_vol: Added missing "needs 2.0" docDavid M. Lee2015-08-141-0/+1
* | | | | | | Merge pull request #1204 from detiber/test_rhsmToshio Kuratomi2015-08-241-15/+71
|\ \ \ \ \ \ \
| * | | | | | | python 2.4 syntax fixJason DeTiberus2015-07-281-1/+4
| * | | | | | | Add example for changing consumed subscriptionsJason DeTiberus2015-07-281-0/+6
| * | | | | | | bugfixes for redhat_subscriptionJason DeTiberus2015-07-281-15/+62
* | | | | | | | Merge pull request #1966 from tback/develBrian Coca2015-08-242-18/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Delete dead and broken codeTill Backhaus2015-08-242-18/+0
|/ / / / / / / /