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

This commit is contained in:
Evan Duffield 2013-07-08 09:26:04 -07:00
commit 56471c52a1

View file

@ -241,7 +241,7 @@ def main():
delete_snapshot = dict(),
name = dict(),
wait = dict(type="bool", default=False),
wait_timeout = dict(default=300),
wait_timeout = dict(default=900),
description = dict(default=""),
no_reboot = dict(default=True, type="bool"),
state = dict(default='present'),