Commit Graph

4 Commits (e36b7130ff1c5366ab1c767641a8819d4fdf5e5f)

Author SHA1 Message Date
Michael DeHaan 8c4161d4a1 Merge branch 'retf_py' of git://github.com/berendt/ansible into devel
Conflicts:
	lib/ansible/inventory/vars_plugins/group_vars.py
	plugins/callbacks/mail.py
10 years ago
Paul Durivage b9f7da7b44 Docker client occasionally returns a NoneType, so we have to catch the TypeError 11 years ago
Christian Berendt 6676720ce5 fixed typos found by RETF rules in PY files
rules are avaialble at https://en.wikipedia.org/wiki/Wikipedia:AutoWikiBrowser/Typos
11 years ago
Paul Durivage f0bb3aeeea Add Docker inventory plugin 11 years ago