cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
James Cammarata 2013-10-01 15:59:29 -05:00
commit 6ea83779e3
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cloud/ec2_eip
View file

@ -2,7 +2,7 @@
DOCUMENTATION = '''
---
module: ec2_eip
short_decription: associate an EC2 elastic IP with an instance.
short_description: associate an EC2 elastic IP with an instance.
description:
- This module associates AWS EC2 elastic IP addresses with instances
version_added: 1.4

2
source_control/bzr
View file

@ -56,7 +56,7 @@ options:
version_added: "1.4"
description:
- Path to bzr executable to use. If not supplied,
the normal mechanism for resolving binary paths will be used.
the normal mechanism for resolving binary paths will be used.
'''
EXAMPLES = '''

2
source_control/git
View file

@ -79,7 +79,7 @@ options:
version_added: "1.4"
description:
- Path to git executable to use. If not supplied,
the normal mechanism for resolving binary paths will be used.
the normal mechanism for resolving binary paths will be used.
notes:
- If the task seems to be hanging, first verify remote host is in C(known_hosts).
SSH will prompt user to authorize the first contact with a remote host. One solution is to add

2
source_control/hg
View file

@ -71,7 +71,7 @@ options:
version_added: "1.4"
description:
- Path to hg executable to use. If not supplied,
the normal mechanism for resolving binary paths will be used.
the normal mechanism for resolving binary paths will be used.
notes:
- If the task seems to be hanging, first verify remote host is in C(known_hosts).
SSH will prompt user to authorize the first contact with a remote host. One solution is to add

2
source_control/subversion
View file

@ -69,7 +69,7 @@ options:
version_added: "1.4"
description:
- Path to svn executable to use. If not supplied,
the normal mechanism for resolving binary paths will be used.
the normal mechanism for resolving binary paths will be used.
'''
EXAMPLES = '''