Merge branch 'devel' of https://github.com/denisphillips/ansible into denisphillips-devel

pull/7280/head
James Cammarata 11 years ago
commit fd03cc04e6

@ -41,7 +41,7 @@ class ActionModule(object):
args = {}
if complex_args:
args.update(complex_args)
args.update(parse_kv(self.runner.module_args))
args.update(parse_kv(module_args))
if not 'key' in args:
raise ae("'key' is a required argument.")

Loading…
Cancel
Save