You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
ansible/lib/ansible
Peter Sprygada 799f8e97b3 fixes an issue with dict_merge in network utils (#41107)
This change address a problem where the dict_merge function would fail
due to the value being a nested dict.  This will now recursively pass
the value back through the dict_merge function.
Merge to devel https://github.com/ansible/ansible/pull/41107

(cherry picked from commit 2a4be2748f)

Update changelog

Fix review comments
7 years ago
..
cli Fix type in ansible-galaxy info output (#49096) 7 years ago
compat Fix the local and ssh plugins for a cornercase retrying a syscall 7 years ago
config better handling of bad type in config (#48821) 7 years ago
errors give hint to users when a file is not found 8 years ago
executor split PS wrapper and payload (CVE-2018-16859) (#49143) 7 years ago
galaxy [stable-2.7] Support .yaml extension for meta file (#46505) 7 years ago
inventory better information for user from inventory plugins (#46766) 7 years ago
module_utils fixes an issue with dict_merge in network utils (#41107) 7 years ago
modules [stable-2.7] -Fix: The Ubuntu 14.04 image on Shippable runs an old version of python, causing issues with checking out bitbucket, adjust tests to compensate. (#49433) 7 years ago
parsing fixes to ansible-doc (#47209) 7 years ago
playbook require git when trying to use it in ansible-galaxy cli (#49212) 7 years ago
plugins [stable-2.7] Reboot - Fix errors when using Paramiko connection (#49002) 7 years ago
template templar: ensure that exceptions are handled, fix 'AttributeError' (#48792) 7 years ago
utils Backport/2.7/46623 (#48154) 7 years ago
vars [stable-2.7] Fix return statement where we short circuit _get_delegated_vars (#48102) 7 years ago
__init__.py
constants.py [stable-2.7] Fix from sivel for ansible-doc 7 years ago
release.py Update Ansible release version to v2.7.4.post0. 7 years ago