From f52f18446dd9761d0d37d340523bed7c0143c1d7 Mon Sep 17 00:00:00 2001
From: Chris Hoge <chris.hoge@puppetlabs.com>
Date: Mon, 7 Oct 2013 14:56:27 -0700
Subject: [PATCH] Preparing for 2.2.0 release.

Updated version and dependencies in Modulefile.
Updated release notes in README.md.

Change-Id: I7910d6390bd967efbeedf42ddd0e7e60a8f4516a
---
 Modulefile | 8 ++++----
 README.md  | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Modulefile b/Modulefile
index a8aa169ae..1377432a8 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-nova'
-version '2.1.0'
+version '2.2.0'
 source  'https://github.com/stackforge/puppet-nova'
 author  'Puppet Labs'
 license 'Apache License 2.0'
@@ -8,9 +8,9 @@ description 'Puppet module to install and configure the OpenStack Nova compute s
 project_page 'https://launchpad.net/puppet-openstack'
 
 ## Add dependencies, if any:
-dependency 'puppetlabs/glance', '>=2.1.0 <3.0.0'
-dependency 'puppetlabs/keystone', '>=2.1.0 <3.0.0'
-dependency 'puppetlabs/cinder', '>=2.1.0 <3.0.0'
+dependency 'puppetlabs/glance', '>=2.2.0 <3.0.0'
+dependency 'puppetlabs/keystone', '>=2.2.0 <3.0.0'
+dependency 'puppetlabs/cinder', '>=2.2.0 <3.0.0'
 dependency 'puppetlabs/mysql', '>=0.6.1 <1.0.0'
 dependency 'puppetlabs/rabbitmq', '>=2.0.2 <3.0.0'
 dependency 'puppetlabs/stdlib', '>=2.5.0'
diff --git a/README.md b/README.md
index 82016397f..cf674f142 100644
--- a/README.md
+++ b/README.md
@@ -88,6 +88,14 @@ Contributors
 Release Notes
 -------------
 
+**2.2.0**
+
+* Added a check to install bridge-utils only if needed.
+* Added syslog support.
+* Added installation of pm-utils for VM power management support.
+* Fixed cinder include dependency bug.
+* Various bug and lint fixes.
+
 **2.1.0**
 
 * Added support for X-Forwarded-For HTTP Headers.