Commit graph

4 commits

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
2014-08-08 12:17:37 -04: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
Christian Berendt 6676720ce5 fixed typos found by RETF rules in PY files
rules are avaialble at https://en.wikipedia.org/wiki/Wikipedia:AutoWikiBrowser/Typos
2014-05-03 18:40:05 +02:00
Paul Durivage f0bb3aeeea Add Docker inventory plugin 2014-04-16 11:27:36 -05:00