From bb047b9e8936afb5025b98b85e4dbf51156541c0 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Tue, 11 Mar 2014 21:12:07 -0400
Subject: [PATCH] Changelog updates for things merged already into 1.6

---
 CHANGELOG.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4380ac5e8bd..4f8ceb16fe4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,12 +11,24 @@ Major features/changes:
 New Modules:
 
 * packaging: cpanm
+* packaging: portage
 * system: debconf
+* system: ufw
+* system: locale_gen
+* cloud: digital_ocean_domain
+* cloud: digital_ocean_sshkey 
+* cloud: nova_group (security groups)
+* cloud: nova_fip (floating IPs)
+* cloud: rax_identity
+* cloud: ec2_asg (configure autoscaling groups)
 
 Other notable changes:
 
-* info pending
-
+* libvirt module now supports destroyed and paused as states
+* s3 module can specify metadata
+* security token additions to ec2 modules
+* misc bugfixes and other parameters
+  
 ## 1.5.1 "Love Walks In" - March 10, 2014
 
 - Force command action to not be executed by the shell unless specifically enabled.