ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-10-09 18:04:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Resolving differences in core modules post-merge

Browse source
This commit is contained in:
James Cammarata 2016-12-07 21:33:38 -05:00 • committed by Matt Clay
commit 8afa090417
115 changed files with 2651 additions and 17913 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/rackspace/rax_scaling_group.py
View file

@ -109,7 +109,7 @@ options:
- Data to be uploaded to the servers config drive. This option implies
I(config_drive). Can be a file path or a string
version_added: 1.8
wait
wait:
description:
- wait for the scaling group to finish provisioning the minimum amount of
servers
@ -121,7 +121,7 @@ options:
description:
- how long before wait gives up, in seconds
default: 300
author: Matt Martz
author: "Matt Martz (@sivel)"
extends_documentation_fragment: rackspace
'''