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

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

View file

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