James Cammarata
faf733bc49
Removing zone choices that overly-limit available zones for gce
...
Fixes #7270
2014-05-05 11:58:39 -05:00
James Cammarata
ef741178c4
Merge pull request #7280 from angstwad/docker_inv_fix
...
Docker inventory bugfix for potential traceback
2014-05-05 10:59:44 -05:00
Paul Durivage
b9f7da7b44
Docker client occasionally returns a NoneType, so we have to catch the TypeError
2014-05-05 10:51:58 -05:00
James Cammarata
fd03cc04e6
Merge branch 'devel' of https://github.com/denisphillips/ansible into denisphillips-devel
2014-05-05 09:22:01 -05:00
Veeti Paananen
d6f4d9b76d
Fix error handling on missing dest with unarchive
...
fixes #7107
2014-05-04 18:22:00 +03:00
Denis Phillips
cd0134d290
Used module_args passed to function instead of from runner
2014-05-04 08:49:12 -04:00
Michael DeHaan
9b52ce8a42
Merge pull request #7267 from berendt/retf
...
fixed typos found by RETF rules in RST files
2014-05-03 12:25:21 -04:00
Christian Berendt
58ff9cd7c8
fixed typos found by RETF rules in RST files
...
rules are avaialble at https://en.wikipedia.org/wiki/Wikipedia:AutoWikiBrowser/Typos
2014-05-03 17:59:50 +02:00
James Cammarata
b753625dbf
Refuse to convert a non-empty directory into a link with the file module
...
Also adds an integration test for the above.
Fixes #7254
2014-05-02 14:46:38 -05:00
James Cammarata
deb532c367
Remove OrderedDict references from runner
...
Fixes #7256
2014-05-02 12:52:36 -05:00
James Cammarata
c6f3a0a4cc
Merge pull request #7243 from jimi-c/issue_7060_lang_c
...
Modify the way we set the localization environment
2014-05-01 16:12:52 -05:00
James Cammarata
ae7503d6fb
Merge branch 'fix-copy-recursive-issue' of https://github.com/tksmd/ansible into tksmd-fix-copy-recursive-issue
2014-05-01 13:39:11 -05:00
James Cammarata
c0f92317ef
Fixing a documentation error in the new stackdriver module
2014-05-01 11:44:31 -05:00
James Cammarata
2b898e7e8b
Minor fix to imports in new stackdriver module
2014-05-01 11:39:46 -05:00
someda
50080b3774
fix #7244 recursive copy fails when setting directory attributes
...
- reverse the order of new_directory_list returned from split_pre_existing_dir in copy module
2014-05-02 01:38:16 +09:00
James Cammarata
6069d5d4cf
Merge branch 'stackdriver' of https://github.com/bwhaley/ansible into bwhaley-stackdriver
2014-05-01 11:21:36 -05:00
James Cammarata
54b1f820fb
Modify the way we set the localization environment
...
Previously, we set the LANG (and LC_CTYPE) environment variables
directly in the module code and applied them with os.environ().
Instead, we are now pre-pending those variables to the environment
string used to execute the command which allows the user to
override the localization values by setting the environment values
directly (even on a per-task basis):
- subversion: repo=file:///path/to/repos/svn_über dest=/tmp/svntest
environment:
LANG: "C"
LC_CTYPE: "en_US.UTF-8"
So if a user wishes to default their LANG back to C, they can still
avoid unicode issues by doing the above.
Fixes #7060
2014-05-01 10:34:53 -05:00
James Cammarata
40a7a306f5
Merge pull request #7236 from jcassee/robust-ssl-cert-concat
...
Make concatenating certs robust in urls.py
2014-04-30 15:48:13 -05:00
James Cammarata
8e45fa9b63
Moving display-related functions to new module in utils
2014-04-30 15:33:46 -05:00
Joost Cassee
978e6d2cd6
Make concatenating certs robust in urls.py
...
Add a newline after each certificate file explicitly to avoid problems
with files that do not end with a newline themselves.
2014-04-30 21:46:37 +02:00
James Cammarata
6069ff6e9e
Adding a new system_warnings config option to supress warnings
2014-04-30 14:44:10 -05:00
James Cammarata
bf7c51ad8a
Adding an ec2_elb test to re-add an instance that had been removed
2014-04-30 13:59:24 -05:00
James Cammarata
93fb82a5a1
Fixing a bad merge commit in packaging/debian/changelog
2014-04-30 13:59:20 -05:00
James Cammarata
f8ca24b046
Merge pull request #7225 from ciupicri/devel-rpm-changelog
...
Fix dates from RPM SPEC changelog
2014-04-30 08:38:00 -05:00
James Cammarata
ce48e1f9ff
Merge pull request #7230 from binarytemple/fix_for_issue_7228
...
fix issue #7228 ec2_vol crash
2014-04-30 08:30:27 -05:00
James Cammarata
6e837d4512
Adding BuildRequires lines for python-setuptools
2014-04-30 08:02:40 -05:00
bryan hunt
88aaa70f0c
fix issue #7228 ec2_vol crash
2014-04-30 10:43:05 +01:00
Cristian Ciupitu
8e9c32ef20
Fix dates from RPM SPEC changelog
...
`make rpm` gives these warnings:
warning: bogus date in %changelog: Thu Feb 28 2014 Michael DeHaan <michael.dehaan@g.c> - 1.5-0
warning: bogus date in %changelog: Thu Jul 05 2013 Michael DeHaan <michael.dehaan@g.c> - 1.2-2
warning: bogus date in %changelog: Thu Aug 6 2012 Michael DeHaan <michael.dehaan@g.c> - 0.7-0
RPM build errors:
bogus date in %changelog: Thu Feb 28 2014 Michael DeHaan <michael.dehaan@g.c> - 1.5-0
bogus date in %changelog: Thu Jul 05 2013 Michael DeHaan <michael.dehaan@g.c> - 1.2-2
bogus date in %changelog: Thu Aug 6 2012 Michael DeHaan <michael.dehaan@g.c> - 0.7-0
2014-04-30 09:47:34 +03:00
James Cammarata
d287179f7b
Updating Makefile for setuptools change
...
Fixes #7224
2014-04-29 20:02:28 -05:00
James Cammarata
be1aceb268
Merge pull request #7215 from lorin/doc-ec2-nocache
...
Document how to turn off ec2 cache
2014-04-29 16:17:44 -05:00
Atlas Health
49d0ad0644
added example
2014-04-29 17:13:25 -04:00
Atlas Health
4258eb6be7
updated docs to include snapshot_tags option
...
added version
2014-04-29 17:13:25 -04:00
James Cammarata
30e4759055
Merge pull request #7208 from jf/copy-module
...
Fix "no_log=True" option for copy module (fixes #7193 )
2014-04-29 16:11:23 -05:00
James Cammarata
863d5f3951
Merge branch 'budlight-patch-2' into devel
2014-04-29 16:00:18 -05:00
James Cammarata
04793ff640
Merge branch 'patch-2' of https://github.com/budlight/ansible into budlight-patch-2
2014-04-29 15:58:05 -05:00
Michael DeHaan
9a70dd1c94
Slight tweak to regex examples.
2014-04-29 16:54:14 -04:00
James Cammarata
dc4f198bad
Forgot to add an assertion for the new rsync_path test
2014-04-29 15:53:32 -05:00
Michael DeHaan
cf54098dab
Merge pull request #6984 from clconway/variable-re-doc
...
Adds search/match examples to "Playbooks > Variables > Jinja2 Filters" d...
2014-04-29 16:50:55 -04:00
Michael DeHaan
56d03fc766
Merge pull request #6994 from tonk/docfix
...
Fix documentation error
2014-04-29 16:50:00 -04:00
Michael DeHaan
4cf67c4722
Clarify lookup plugin execution location per request.
2014-04-29 16:49:34 -04:00
Michael DeHaan
6b26efdee0
Merge pull request #7119 from jjshoe/patch-4
...
Finish reverting a broken commit in #5679
2014-04-29 16:47:46 -04:00
James Cammarata
ac1948c04c
Minor tweak to rsync_path construction in synchronize module
...
Fixes #7182
2014-04-29 15:47:16 -05:00
James Cammarata
45237f270d
Adding a new test for the synchronize module to test rsync_path
2014-04-29 15:47:16 -05:00
Michael DeHaan
e54320412d
Add Mavericks install notes
2014-04-29 16:42:25 -04:00
Michael DeHaan
0720af11ae
Merge pull request #7186 from jf/docfix-obvious-quick-simples
...
Obvious quick fixes:
2014-04-29 16:38:26 -04:00
James Cammarata
0e7b9e5cfc
Commenting out pkg_resources lines for now, as they break hacking/env-setup
2014-04-29 15:24:00 -05:00
James Cammarata
be4e6d359f
Merge branch 'delegate_to_honor_ssh_private_key_file' of https://github.com/renard/ansible into renard-delegate_to_honor_ssh_private_key_file
2014-04-29 15:05:09 -05:00
James Cammarata
3416c33026
Merge branch 'abadger-feature/multi-version-import' into devel
2014-04-29 14:54:23 -05:00
James Cammarata
8e66a6c811
Cleaning up the import testing around setuptools
2014-04-29 14:53:44 -05:00
Michael DeHaan
d5e254d3c7
Merge pull request #6794 from follower/patch-4
...
Make `vpc_security_group` docs more accurate
2014-04-29 15:49:57 -04:00