Commit Graph

9220 Commits (20f01571521b8ac44149a5a64673fe492a542861)
 

Author SHA1 Message Date
Michael DeHaan 20f0157152 Merge pull request #6378 from franckcuny/headers-gce-utils
Add BSD license to module_utils/gce.py
11 years ago
Richard Isaacson 4993cb57f4 Merge pull request #6283 from magicrobotmonkey/upstream
fix missing stdin in _parallel_runner

Tested with GIST https://gist.github.com/risaacson/7290d30a612e0c70ea1b.
Passes "make tests"
Passes non_destructive tests.
11 years ago
Franck Cuny 82f99bfa3d Add BSD license to module_utils/gce.py 11 years ago
Michael DeHaan d9c22cd997 Merge pull request #6377 from sivel/issue/6348
Don't lstrip data to be parsed by parse_yaml. Fixes #6384
11 years ago
Matt Martz 4b400ca5e9 Only used stripped data for testing if the file is json, but used unstripped when actually parsing. Fixes #6348 11 years ago
Michael DeHaan 678fb4ffbe Merge pull request #6368 from jjshoe/patch-1
Make this statement understandable grammatically
11 years ago
jjshoe 2ccbdd65c1 Make this statement understandable grammatically 11 years ago
Michael DeHaan 53fd5295dc Merge pull request #6351 from franckcuny/typo
Remove mention to AWS in Linode's inventory script.
11 years ago
Michael DeHaan d636c93a9b Merge pull request #6352 from sethwoodworth/patch-1
Spelling correction in loop warning, removes unnecessary c
11 years ago
Seth Woodworth 1d5db30067 Updates loop warning, removes unnecessary c 11 years ago
Franck Cuny 54b3262e71 Remove mention to AWS in Linode's inventory script. 11 years ago
James Cammarata 04a6dc6d12 Check for skipped tags in passed role variables before adding to them
Fixes #6330
11 years ago
Michael DeHaan c79b5ea4b4 Merge pull request #6344 from alimony/patch-1
Touch up documentation strings for DigitalOcean.
11 years ago
Michael DeHaan 734a16afb4 Merge pull request #6347 from dwheaton/patch-1
Update playbooks_variables.rst
11 years ago
David Wheaton 00ed2b811f Update playbooks_variables.rst
incorrect/confusing wording in Jinja2 note?
11 years ago
Michael DeHaan 5f3ea7512f Merge pull request #6343 from dolph/devel
spelling correction for "separate"
11 years ago
Markus Amalthea Magnuson 3f681ebc52 Touch up documentation strings for DigitalOcean. 11 years ago
Dolph Mathews 8808e029f9 spelling correction for "separate"
s/seperate/separate/

http://en.wiktionary.org/wiki/separate
11 years ago
Michael DeHaan 8388ce626f Merge pull request #6326 from karelstriegel/patch-1
Update intro_adhoc.rst
11 years ago
Michael DeHaan d2cb35f898 Merge pull request #6320 from angstwad/instance-redo
Use isinstance() rather than a check using type()
11 years ago
Richard Isaacson 9eb47bfd7c Merge pull request #6338 from risaacson/issues_5354
unarchive module: Add creates functionality.
11 years ago
Richard C Isaacson a483e42583 unarchive module: Add creates functionality.
Closes GH-5354.

Forklift copy logic into unarchive. Provides integration unit tests.
11 years ago
James Cammarata 4753804ab4 Merge pull request #6332 from jimi-c/issue_6329_space_in_var
Correctly catch template errors without returning invalid data
11 years ago
James Cammarata e3b887f770 Fix range issue in inventory and add additional error checking
Fixes #6331
11 years ago
Richard Isaacson d3cbde57f5 Merge pull request #6334 from risaacson/pull_6033
Yum: Fix logic in yum.
11 years ago
Richard C Isaacson d6247a3583 Yum: Fix logic in yum. 11 years ago
Richard Isaacson 194f270a92 Merge pull request #6333 from risaacson/pull_6033
Merge pull_6033.
11 years ago
Richard C Isaacson 47b2dc611c Look at the filename and if it has a version defined possibly process this as a downgrade. 11 years ago
James Cammarata 3cd7d47b7e Correctly catch template errors without returning invalid data
Fixes #6329
11 years ago
Richard C Isaacson 9244283122 Spelling and formatting. 11 years ago
Cove Schneider 29f1528492 change order of copyright 11 years ago
Cove Schneider f47fe7af62 add sponsor copyright/attribution 11 years ago
Cove Schneider cbd1da6457 add yum module downgrade support 11 years ago
Richard Isaacson 9a06292a52 Merge pull request #6328 from lathan/patch-1
english syntax fix
11 years ago
James Laska c7d1c1a306 [test_service] correct upstart service name and permissions
The 'service' utility was unable to find the 'ansible_test' service due to an
unexpected filename.  This patch corrects the filename and adjusts the
permissions to match other service scripts within /etc/init/.
11 years ago
George Angelopoulos e846b4c619 english syntax fix
remove redundant 'are'
11 years ago
karelstriegel 2cf3a7f7be Update intro_adhoc.rst
Small grammar fix
11 years ago
James Cammarata f80d02d841 Properly wrap logical elements together for su/sudo detection 11 years ago
James Cammarata b6056044b7 Partial revert of 73c883c due to issues with handlers in roles
Fixes #6322
11 years ago
Michael DeHaan e486dbab04 Use the loaded variable since we have it assigned, not just for error detection. 11 years ago
Michael DeHaan 3f07ec3d73 Fixup JSON error reporting in previous commits. 11 years ago
Michael DeHaan a4d01b0891 Also search .json filenames 11 years ago
Michael DeHaan 79799f6819 Allow any file that can be in YAML to also be in JSON. This is primarily done to support non-visual editors better. 11 years ago
James Cammarata a0f939581d Merge branch 'aresch-devel' into devel 11 years ago
Paul Durivage 3cce3650e5 Use isinstance() rather than a check using type() 11 years ago
Richard Isaacson 119434d079 Merge pull request #6319 from risaacson/fix_test_dir_inventory
Fix TestInventory Unit Tests

Tested clean.
11 years ago
James Cammarata 9b79591f23 Merge branch 'devel' of https://github.com/aresch/ansible into aresch-devel 11 years ago
James Laska 868746b095 Correct ansible_distribution typo
Redhat != RedHat
11 years ago
James Laska ba9950a73a Use correct value of ansible_distribution in integration tests
This fixes integration tests when run on a RHEL system.  Oddly, the
ansible_distribution='RedHat' when run on RHEL.
11 years ago
James Cammarata 5a235f9e99 Merge pull request #6318 from jimi-c/issue_5305_ec2_elb_None_issue
Adding a wait loop to ec2_elb for the initial lb state when registering
11 years ago