ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity
18721 commits 10 branches 167 tags 272 MiB
Commit graph

6577 commits

Author SHA1 Message Date
James Cammarata
ccf646665b Revert "Removing explicit setting of failed/failed_when" 
This reverts commit 4e528e9535.
 2016-03-10 08:01:54 -05:00
James Cammarata
4e528e9535 Removing explicit setting of failed/failed_when 2016-03-10 07:42:16 -05:00
Brian Coca
df1268ed69 Merge pull request #14892 from dagwieers/patch-14 
Another misspelling
 2016-03-09 23:57:56 -05:00
Brian Coca
05983fdaa5 Merge pull request #14891 from dagwieers/patch-13 
Fix misspelling and some cosmetic change
 2016-03-09 23:57:25 -05:00
Brian Coca
1c1f5e9f99 Merge pull request #14889 from nitzmahone/fix_failed_when_blind_override 
Fix blind override in failed_when
 2016-03-09 23:53:11 -05:00
Peter Sprygada
ca2871de20 Merge pull request #14697 from privateip/shared_module_openswitch 
bugfixes for openswitch shared module
 2016-03-09 22:15:35 -05:00
Peter Sprygada
ae5951b97f Merge pull request #14698 from privateip/plugin_action_ops_template 
updates the ops_template plugin action backup key
 2016-03-09 22:14:56 -05:00
Dag Wieers
a5e11b1325 Another misspelling 
...while reading the source
 2016-03-10 03:24:04 +01:00
Dag Wieers
d7d04ad2cd Fix misspelling and some cosmetic change 2016-03-10 03:18:09 +01:00
nitzmahone
dbff3a6bbc Fix blind override in failed_when 
caused all task failures to be success
 2016-03-09 17:48:59 -08:00
Brian Coca
18e9bc9753 common retry and rate limiting decorators for apis 
allows modules to wrap their request functions in common retry and rate limiting
decorators or functions
 2016-03-09 16:55:47 -05:00
Brian Coca
9318727021 corrected changed_when handling 2016-03-09 16:09:05 -05:00
James Cammarata
7f233c4c5e Updating submodule refs 2016-03-09 15:52:23 -05:00
Toshio Kuratomi
331f62f769 Update submodule refs 2016-03-09 11:28:49 -08:00
Toshio Kuratomi
0628951ac6 Handle shlex incompatibility between python2.6 and python3 2016-03-09 11:27:19 -08:00
Toshio Kuratomi
c0e2dd1693 Fix ssh connection plugin to work with python3 2016-03-09 11:17:10 -08:00
James Cammarata
eb463fab00 Also changing ansible-shell -> ansible-console in cli code comments 2016-03-09 13:53:52 -05:00
James Cammarata
9d61a6cba8 Fixing PlayIterator bugs 
* Unit tests exposed a problem where nested blocks did not correctly
  hit rescue/always portions of parent blocks
* Cleaned up logic in PlayIterator
* Unfortunately fixing the above exposed a potential problem in the
  block integration tests, where a failure in an "always" section may
  always lead to a failed state and the termination of execution
  beyond that point, so certain parts of the block integration test
  were disabled.
 2016-03-09 13:31:30 -05:00
Brian Coca
d7bd5fc075 Merge pull request #14824 from bcoca/ansible_shell 
draft 1st release of ansible shell
 2016-03-09 13:21:25 -05:00
Brian Coca
7067bb32b8 make all conditionals lists 
this brings them to equivalence with when:
fixes #13905
 2016-03-09 09:33:59 -05:00
Matt Clay
33f93f9241 Fix misplaced paren. 2016-03-08 22:16:23 -08:00
Brian Coca
33b550fc76 paging for amazon modules 
this adds a decorator for use in amazon modules so retrieval functions
can page using the 'marker' that most boto functions return
 2016-03-09 00:53:33 -05:00
James Cammarata
aee2eb6287 Merge pull request #14864 from dagwieers/patch-12 
Only show diff when the task actually induced a change
 2016-03-08 15:02:49 -05:00
James Cammarata
1a5ee115f0 Fixing minor logic error in error detection/handling in ssh connection plugin 
If max retries were reached, no AnsibleConnectionFailure was raised, which
means potentially in some cases an unreachable error might not be returned
 2016-03-08 14:50:35 -05:00
Dag Wieers
f5b6f52940 Only show diff when the task actually induced a change 
This implements solution #1 in the proposal #14860.

It only shows the diff if the task induced a change, which means that if the changed_when control overrides the task, not diff will be produced.
See #14860 for a rationale and the use-case.
 2016-03-08 17:33:29 +01:00
Dag Wieers
175351f200 Little improvement in flow 
Don't get the hostname if it's not needed.
 2016-03-08 17:23:34 +01:00
Brian Coca
49bb4803b5 clarify --step prompt 
now shows full words and indicates default
fixes #7433
 2016-03-08 10:57:54 -05:00
Brian Coca
3d6ec52e83 Merge pull request #14830 from bcoca/assemble_fix 
fix assemble to not pass extra args to copy/file
 2016-03-08 09:22:15 -05:00
Brian Coca
eb4cb46c84 Merge pull request #14859 from sivel/issue/14858 
Strip proc_1 before testing it. Fixes #14858
 2016-03-08 09:14:05 -05:00
Matt Martz
2f90a4f4e2 Strip proc_1 before testing it. Fixes #14858 2016-03-08 07:42:42 -06:00
Brian Coca
e24e619cf1 added stderr from vault script to error 2016-03-07 20:51:58 -05:00
Brian Coca
75ae62a978 Merge pull request #12674 from sudarkoff/fail_if_executable_password_file_returns_nonzero 
(TRIVIAL) Fail if the vault password script returns non-zero.
 2016-03-07 20:45:26 -05:00
Brian Coca
e74ab3ecdd draft 1st release of ansible-console 
porting @dominis 's ansible-shell tool from 1.9 and integrating it into ansible
added verbosity control
made more resilitent to several errors
added highlight color, to configurable colors
more resilient on exception and interruptions
prompt coloring, goes red and changes to # when using become = true and root
become setting is now explicit and not a toggle
 2016-03-07 20:25:21 -05:00
Matt Martz
53bb889ef6 update submodule refs 2016-03-07 16:12:19 -06:00
Matt Martz
098333b2ec Fix redirects for get_url 
* fetch_url shouldn't both accept follow_redirects and support follow_redircts via module.params
* Default follow_redirects for open_url should be 'urllib2'
* Add redirect test for get_url
 2016-03-07 15:44:31 -06:00
Brian Coca
325fccfa78 added v for least verbose display function 2016-03-07 13:17:31 -05:00
James Cammarata
299d93f6e9 Updating unit tests for PlayIterator 
This knowingly introduces a broken test, planning to fix that later.
 2016-03-07 13:03:06 -05:00
Brian Coca
66ea464ebd Merge pull request #14793 from xiaket/devel 
remove main_q for simplicity.
 2016-03-07 12:51:38 -05:00
Brian Coca
25e9b5788b add per item diff handling 
fixes #14843
 2016-03-07 09:49:18 -05:00
John Barker
8b4ebd8e4a Make it easier to read error message 2016-03-07 12:49:41 +00:00
Brian Coca
0b2f631197 Merge pull request #14504 from bcoca/template_comments 
template also when only comments present
 2016-03-06 10:45:18 -05:00
Brian Coca
7d8b84dae6 fix assemble to not pass extra args to copy/file 
also small refactor to dedupe code
fixes https://github.com/ansible/ansible-modules-core/issues/3154
 2016-03-06 10:00:36 -05:00
Brian Coca
5aab158987 removed unused imports 2016-03-06 09:14:25 -05:00
Peter Sprygada
c0f1e1801b adds multiline flag to regex test for search and match 
This commit adds the multiline flag to the regexp search and match test
plugin.  It defaults to re.M = False for backwards compatibility.  To use
the multiline feature add multiline=True to the test filter

{{ config | search('^hostname', multiline=True) }}
 2016-03-06 08:11:46 -05:00
Brian Coca
66a9a1feff Merge pull request #14823 from jjahns/devel 
add find_vm_by_name function to vmware utils
 2016-03-05 23:17:35 -05:00
Brian Coca
75b9c7db14 moved hardcoded settings from doccli to constants 2016-03-05 17:40:44 -05:00
Jay Jahns
3a1944edc1 add find_vm_by_name function to vmware utils 2016-03-05 11:50:51 -08:00
Kishin Yagami
299c18d700 Support strategy_plugins setting in a configuration file 2016-03-05 20:15:04 +09:00
Brian Coca
62ac5c047e clarified message 2016-03-04 14:44:03 -05:00
Brian Coca
8867d73420 reject extraneous data passed to mode 
strictly permissions are allowed, file type info should not be passed in
alternate fixes #14771
 2016-03-04 14:42:29 -05:00
Toshio Kuratomi
bd618c3490 Merge pull request #14797 from mattclay/unicode-fixes 
Use to_bytes on filenames in filesystem calls.
 2016-03-04 10:38:56 -08:00
Brian Coca
d6546a7513 make sure group_names is always sorted 
this makes it consistent with previous ansilbe versions and other
paths that create the group_names variable
 2016-03-04 13:12:35 -05:00
Matt Clay
5b79ed77e7 Use to_bytes on filenames in filesystem calls. 2016-03-04 09:08:41 -08:00
Brian Coca
27a33a6f18 dont erase previous nameservers in fact gathering 
fixes #14806
 2016-03-04 11:34:44 -05:00
夏恺(Xia Kai)
b33074b703 remove main_q for simplicity. 
main_q is not used anywhere in the codebase.

It is created in TaskQueueManager._initialize_processes, bundled with rslt_q
into TaskQueueManger._workers, later unwrapped in StrategyBase but not used.
This queue is closed in TaskQueueManger._cleanup_processes.

Historically, it is passed as a init parameter into WorkerProcess,
introduced in 62d7956, but this behavior is changed in 120b9a7.

Signed-off-by: 夏恺(Xia Kai) <xiaket@gmail.com>
 2016-03-04 07:58:18 +00:00
Toshio Kuratomi
8f1303c81a Remember to use errors=strict since this is looking up a filename on the filesystem (ie it has to match exactly) 2016-03-03 20:56:50 -08:00
Toshio Kuratomi
253376b3b7 Make the source path into a byte string before passing to os.path 2016-03-03 20:44:01 -08:00
Brian Coca
e762095497 better task parsing errors 
fixes #14790
 2016-03-03 19:51:15 -05:00
Brian Coca
f565508d7f Merge pull request #14764 from bcoca/max_diff_config 
made max diff size configurable
 2016-03-03 18:19:27 -05:00
Brian Coca
e432973310 Merge pull request #14757 from bcoca/register_no_template 
don't template register
 2016-03-03 18:18:44 -05:00
Brian Coca
13282e29a8 Merge pull request #14500 from yfried-redhat/fix_os_auth 
Fix openstack auth type
 2016-03-03 18:16:56 -05:00
Brian Coca
b901b15d3b Merge pull request #14537 from Yannig/devel_better_error_handling 
Improve message content to get more hint about the raised error.
 2016-03-03 18:11:04 -05:00
Brian Coca
cc3cb0f65e fix issues with older yaml lib versions 
also added missing json import and removed unused ones
 2016-03-03 18:13:36 -05:00
Brian Coca
6cad356b3b updated docs to show new output 2016-03-03 18:05:39 -05:00
Brian Coca
b2a6784a9f changed the output to keep backwards compat 
still shows path when verbose
 2016-03-03 18:03:02 -05:00
Brian Coca
fd8593d613 Merge pull request #14661 from jjshoe/fix-up-profile-tasks 
Update the profile task callback plugin to include a fix for duplicate named tasks. Added additional features to adjust the number of tasks output and the sort order.
 2016-03-03 17:46:40 -05:00
Brian Coca
c022a43a47 fixed str to to_str 2016-03-03 14:40:35 -05:00
Brian Coca
347aa7b032 Merge pull request #14774 from lamby/ignore-epipe-when-flushing-stdout-stderr 
Ignore EPIPE when flushing stdout stderr
 2016-03-03 14:26:20 -05:00
Chris Lamb
eb1141ee79 Ignore EPIPE to avoid tracebacks when piping output to other commands 
For example:

  $ ansible web --list-hosts | head -n1
  hosts (7):
  ERROR! Unexpected Exception: [Errno 32] Broken pipe
  Traceback (most recent call last):
    File "/home/lamby/git/private/lamby-ansible2/.venv/bin/ansible", line 114, in <module>
      display.display("to see the full traceback, use -vvv")
    File "/home/lamby/git/private/lamby-ansible2/.venv/local/lib/python2.7/site-packages/ansible/utils/display.py", line 133, in display
      sys.stdout.flush()
  IOError: [Errno 32] Broken pipe

Such a pipe target will close up shop early when its seen enough input,
causing ansible to print an ugly traceback.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
 2016-03-03 19:21:06 +00:00
Chris Lamb
951c8a5d27 Alias fileobj. 2016-03-03 19:16:58 +00:00
Brian Coca
4cfd042839 more complete and informative errors 
mostly templating issues now all return data templated and actual error
fixes #14781
 2016-03-03 13:52:09 -05:00
Brian Coca
0031a72e0d tweak deprecation warnings display 2016-03-03 13:51:44 -05:00
Brian Coca
ea5e089056 restore initial json parsing attempt to loader 
fixes issues with extra vars json strings not being parsed correctly by the yaml parser
 2016-03-03 13:26:50 -05:00
Toshio Kuratomi
4657be4eab Transform pathnames to bytes before passing on to os.path functions 2016-03-03 09:03:28 -08:00
Toshio Kuratomi
468eea82bd Merge pull request #14765 from sivel/redirect-ssl-validation 
Support SSL validation with redirect control for python versions without ssl context
 2016-03-03 07:06:34 -08:00
Matt Davis
0ab29f573a Merge pull request #14755 from bcoca/pause_nohup_fix 
avoid issues when stdin is a closed file
 2016-03-02 22:33:58 +00:00
Matt Martz
6ff0b079b4 Support SSL validation with redirect control for python versions without ssl context 2016-03-02 16:30:16 -06:00
Brian Coca
c24249c57d made max diff size configurable 2016-03-02 17:25:22 -05:00
Toshio Kuratomi
1dbbd2a80c Remove debugging and fix the place where bytes are being handed to StringIO 2016-03-02 09:31:06 -08:00
Brian Coca
ca0797fc4e avoid issues when stdin is a closed file 
this seems to happen when nohup is involved, so the check tty
does not get a chance to fail, it just works with pipes

fixes http://github.com/ansible/ansible-modules-core/issues/3166
 2016-03-02 11:58:16 -05:00
Toshio Kuratomi
093b3422ec more information 2016-03-02 08:58:15 -08:00
Brian Coca
7ba790bbaf don't tempalte register 2016-03-02 11:57:43 -05:00
Toshio Kuratomi
5aef65edcd Testing whether this fixes jenkins 2016-03-02 07:47:32 -08:00
James Cammarata
3247390123 Conditionally import StringIO in template so we only use io.StringIO on py3 2016-03-02 09:34:43 -05:00
James Cammarata
2c7a33f71d Fixing bug in setup related to StringIO fixes 2016-03-02 08:05:43 -05:00
James Cammarata
9acb5aa176 Changing location of reduce import to not use six.moves 2016-03-01 17:06:46 -05:00
James Cammarata
b559d0e6ee Adding py3 stub for reduce from six.moves 2016-03-01 16:55:01 -05:00
Brian Coca
71402abf21 only do squash when 'squashable field' present 2016-03-01 15:11:34 -05:00
James Cammarata
e011f52557 Expanding unit tests for module_utils/basic.py 2016-03-01 13:53:13 -05:00
Brian Coca
7af5787030 Merge pull request #14717 from xiaket/devel 
Fix __repr__ for meta tasks
 2016-03-01 08:37:09 -05:00
Brian Coca
dd003a42b0 Merge pull request #14273 from resmo/for-ansible-2.1 
[2.1] cloudstack: new generic code
 2016-03-01 08:17:42 -05:00
Rene Moser
6c641fb6a8 cloudstack: add CS_HYPERVISORS constant 2016-03-01 08:05:32 +01:00
夏恺(Xia Kai)
d033c40e80 Make task repr really work for meta tasks. 
Signed-off-by: 夏恺(Xia Kai) <xiaket@xiaket@gmail.com>
 2016-03-01 06:03:22 +00:00
Brian Coca
0d1138e0a0 Merge pull request #14712 from chouseknecht/galaxy2_paging 
Fix bug 14715: Galaxy CLI paging error
 2016-02-29 22:47:57 -05:00
chouseknecht
42b2077c93 Fix bug 14715: Galaxy CLI paging error 2016-02-29 21:21:32 -05:00
Peter Sprygada
c2ce509aaf bugfixes for openswitch shared module 
This commit fixes two bugs in the openswitch shared module.  The first
bug was a wrong argument type for the use_ssl argument.  It was set
to int and should be bool.  The second changes the default ports for http
(was 80, now 8091) and https (was 443, now 18091).  This change aligns
the default port values with the OS
 2016-02-29 20:24:07 -05:00
nitzmahone
915037c628 update submodule refs 2016-02-29 16:43:30 -08:00
nitzmahone
ac54f66741 don't lock file when calculating checksum 2016-02-29 16:30:55 -08:00
Brian Coca
badc922c73 added warning for when host file doesn't exist 
fixes #14692
 2016-02-29 16:18:06 -05:00
Brian Coca
82d6a83cca Merge pull request #14633 from Etherdaemon/fix_boto3_params 
Fixup boto3_conn aws_session_token and verify
 2016-02-29 15:58:11 -05:00
Brian Coca
157ebcfe0b Merge pull request #14709 from bcoca/squash_fix_atp 
added package to special 'squashable' fields
 2016-02-29 15:36:55 -05:00
Brian Coca
67d5b77898 added package to special 'squashable' fields 
apt has it as alias, this should fix https://github.com/ansible/ansible-modules-core/issues/3145
 2016-02-29 15:21:17 -05:00
James Cammarata
7c049c3200 Fixing up jsonify and adding unit tests 2016-02-29 14:51:23 -05:00
Matt Martz
d0a717694f Fix variable name in paramiko connection plugin 2016-02-29 10:12:17 -06:00
Matt Martz
e27eb73cba sys.subversion unavailable in py24. Fixes #14704 2016-02-29 09:05:48 -06:00
Peter Sprygada
f67bf3f775 updates the ops_template plugin action backup key 
This commit changes the key the ops_template will search for in order
to backup the current configuration to local disk on the Ansible control
host.  This change was made to make ops_template consistent with the
other network template modules.
 2016-02-28 23:40:05 -05:00
Toshio Kuratomi
e01b6ad6b4 We are actually taking the repr of a string so we need separate to_bytes and repr calls 2016-02-26 16:57:32 -08:00
Toshio Kuratomi
b70bf3b056 Use io.StringIO and io.BytesIO instead of StringIO.StringIO for compat with py3 2016-02-26 16:43:05 -08:00
Toshio Kuratomi
c29f51804b Fix mixing of bytes and str in module replacer (caused traceback on python3) 2016-02-26 16:43:05 -08:00
Brian Coca
512d3dd621 with_ loops always should want a list 2016-02-26 14:56:54 -05:00
Brian Coca
528f073bfa update core subref 2016-02-26 13:51:38 -05:00
Toshio Kuratomi
1f2595306a normalize path components to unicode before combining or operating on them 
Note that this will break if we deal with non-utf8 paths.  Fixing this
way because converting everythig to byte strings instead is a very
invasive task so it should be done as a specific feature to provide
support for non-utf8 paths at some point in the future (if needed).
 2016-02-26 10:29:37 -08:00
Toshio Kuratomi
ef8bec18bf Use a unicode format string so that we don't convert to byte strings 
Fixes #14349
 2016-02-26 10:29:37 -08:00
Dag Wieers
0eca47cf91 Avoid merging a dict and a AnsibleUnicode 
This is the same fix we applied to v1.9 in PR #14565, however it does not fix #14678 completely !
The dictionaries are not being merged as tey are on v1.9.
 2016-02-26 15:03:51 +01:00
Brian Coca
ad5a6e7993 updated submodule refs 2016-02-25 17:23:20 -05:00
James Cammarata
771f1e31a9 Rework the way ad-hoc filters inventory to match how cli/playbook does it 2016-02-25 12:36:44 -05:00
Brian Coca
e2d2798a42 hosts can be list or string 2016-02-25 11:30:41 -05:00
Brian Coca
2d56293768 default play name to hosts entry 
return to previous behaviour as now the name was left blank
 2016-02-25 11:25:17 -05:00
Joel
b3aa373932 Update the profile task callback plugin to include a fix for duplicate named tasks. Added additional features to adjust the number of tasks output and the sort order. 2016-02-25 10:02:36 -06:00
James Cammarata
cd51ba7965 Use abspath instead of realpath for group/host vars files 
The use of realpath means when following symlinks the actual path is
used when loading these files in the VariableManager, which may not
line up with the host or group name specified.

Fixes #14545
 2016-02-24 13:10:49 -05:00
Toshio Kuratomi
9c9cce51ab Update submodule refs 2016-02-24 08:53:28 -08:00
Brian Coca
03c33053aa clarified become options do not imply others 
fixes #14635
 2016-02-24 10:58:40 -05:00
Etherdaemon
06977d5cb1 Fixup boto3_conn as commit 6ea772931f broke commit 27398131cf 2016-02-24 16:41:30 +10:00
James Cammarata
2db3f290ba Fix logic error when copying files recursively to a directory 2016-02-23 16:29:57 -05:00
Brian Coca
34541b4e5e preserve no_log for async also 2016-02-23 15:37:39 -05:00
James Cammarata
d74ea51287 Submodule update 2016-02-23 15:18:40 -05:00
James Cammarata
da02aba173 Don't inject PlayContext properties as variables if they're None 
Fixes bug introduced in 078ebb0
 2016-02-23 15:07:51 -05:00
James Cammarata
e02b98274b issue callbacks per item and retry fails 
- now workers passes queue to task_executor so it can send back events per item and on retry attempt
- updated result class to pass along events to strategy
- base strategy updated to forward new events to callback
- callbacks now remove 'items' on final result but process them directly when invoked per item
- new callback method to deal with retry attempt messages (also now obeys nolog)
- updated tests to match new signature of task_executor

fixes #14558
fixes #14072
 2016-02-23 15:07:06 -05:00
Brian Coca
6eb4633b07 always return a checksum key, even if empty 2016-02-23 15:07:14 -05:00
Peter Sprygada
fc57b88356 Merge pull request #14618 from ogenstad/devel 
Fixes authentication error bug when user has rsa keys
 2016-02-23 14:14:20 -05:00
James Cammarata
6cf6130468 Fixing/cleaning up do/until logic in TaskExecutor 
* Fixes bug where the task was not marked as failed if the number of
  retries were exceeded (#14461)
* Reorganizing logic to be a bit cleaner, and so retrie messages are
  shown before sleeping (which makes way more sense)

Fixes #14461
Fixes #14580
 2016-02-23 13:17:51 -05:00
Matt Martz
cacb74aeeb Merge pull request #14340 from sivel/uri-no-httplib2 
Add RedirectHandler class for controlling redirects in urllib2
 2016-02-23 11:53:16 -06:00
Matt Martz
27a55d3f33 Merge pull request #14586 from sivel/python-facts 
Add python info to facts
 2016-02-23 11:31:06 -06:00
Matt Martz
3ac0143cf1 Merge pull request #13654 from sivel/paramiko-proxy-command 
Add ProxyCommand support to the paramiko connection plugin
 2016-02-23 11:30:43 -06:00
Matt Martz
38b663471d Merge pull request #14311 from sivel/unsafe-yaml-constructor 
Add new 'unsafe' YAML constructor
 2016-02-23 11:29:53 -06:00
Matt Martz
d9a207f24f Add has_sslcontext fact as well 2016-02-23 11:28:04 -06:00
Matt Martz
7158eb489f Add python info to facts 2016-02-23 10:38:41 -06:00
ogenstad
3f95f163ff Avoids authentication failed exception if user has private rsa keys under .ssh 2016-02-23 11:17:24 +01:00
James Cammarata
078ebb0dec Don't re-inject become* variables as it causes problems when templating is involved 
Prior to 75b6f61, we strictly limited variables we re-injected. After that
patch however, we re-injected everything which causes problems under certain
circumstances. For now, we'll continue to filter out some properties of
PlayContext for re-injection.

Fixes #14352
 2016-02-22 17:09:58 -05:00
Brian Coca
e35b1cf154 show task path on vv and above 2016-02-21 16:22:39 -05:00
Brian Coca
cea10794fd removed unused color var 2016-02-21 02:03:48 -05:00
Matt Martz
f8211f83a0 Merge pull request #14591 from sivel/issue/14541 
Allow lookups to return python data structures
 2016-02-20 16:24:59 -06:00
Matt Martz
439a385215 Catch TypeError on join, and if caught just return a single item, or a list of many 2016-02-20 16:17:58 -06:00
Brian Coca
d9246aacd0 fixed mount sizes for linux 2016-02-20 14:46:18 -05:00
Brian Coca
f1d2b9ea9e added size to mount facts on all non linux OSs 
fixes #14528
 2016-02-20 14:40:42 -05:00
Brian Coca
547afda8d4 Merge pull request #14546 from furlongm/devel 
fix ansible_os_family fact on openSUSE Leap
 2016-02-20 12:46:27 -05:00
Brian Coca
d87fd68287 Merge pull request #14560 from dagwieers/merge_hash_v2 
Improve efficiency of merge_hash (Ansible v2.0)
 2016-02-20 12:39:49 -05:00
Brian Coca
81368d8119 Merge pull request #14552 from kilburn/lsblk-dedup 
Avoid duplicate /bin/lsblk calls in the setup module.
 2016-02-20 12:24:22 -05:00
Brian Coca
6febb816d2 Merge pull request #14569 from sivel/json-stdout-callback 
Add json stdout callback
 2016-02-19 07:12:30 -08:00
George Christou
bbc855c218 Make --diff lines of context configurable 2016-02-19 12:18:09 +00:00