From aee1fcad05e4b66c405ab65f32a0d3f64d54500c Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael@ansibleworks.com>
Date: Mon, 18 Nov 2013 17:59:40 -0500
Subject: [PATCH] Update changelog, rename vpc module to ec2_vpc.

---
 CHANGELOG.md                   | 8 +++++++-
 library/cloud/{vpc => ec2_vpc} | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
 rename library/cloud/{vpc => ec2_vpc} (99%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f9bf870990..053d373a13d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,8 @@ Highlighted new features:
 * The name of each role is now shown before each task if roles are being used
 * Adds a "var=" option to the debug module for debugging variable data.  "debug: var=hostvars['hostname']" and "debug: var=foo" are all valid syntax.
 * Variables in {{ format }} can be used as references even if they are structured data
-* 
+* Can force binding of accelerate to ipv6 ports.
+
 New modules and plugins:
 
 * cloud:ec2_eip -- manage AWS elastic IPs
@@ -30,6 +31,7 @@ New modules and plugins:
 * system: modprobe -- manage kernel modules on systems that support modprobe/rmmod
 * system: open_iscsi -- manage targets on an initiator using open-iscsi
 * utilities: include_vars -- dynamically load variables based on conditions.
+* cloud: ec2_vpc -- manage ec2 virtual private clouds
 
 Plugins:
 
@@ -63,6 +65,10 @@ Misc changes:
 * Fixes for IPv6 addresses in inventory text files
 * name of executable can be passed to pip/gem etc, for installing under *different* interpreters
 * copy of ./hacking/env-setup added for fish users, ./hacking/env-setup.fish
+* file module more tolerant of non-absolute paths in softlinks.
+* miscellaneous fixes/upgrades to async polling logic.
+* conditions on roles now pass to dependent roles
+* 
 
 1.3.4 "Top of the World" (reprise) - October 29, 2013
 
diff --git a/library/cloud/vpc b/library/cloud/ec2_vpc
similarity index 99%
rename from library/cloud/vpc
rename to library/cloud/ec2_vpc
index c7d708f92ae..42b44e72bc8 100644
--- a/library/cloud/vpc
+++ b/library/cloud/ec2_vpc
@@ -16,7 +16,7 @@
 
 DOCUMENTATION = '''
 ---
-module: vpc 
+module: ec2_vpc 
 short_description: configure AWS virtual private clouds
 description:
     - Create or terminates AWS virtual private clouds.  This module has a dependency on python-boto.