From 8a86bf8018a20a49a15c67f632796a841b763d63 Mon Sep 17 00:00:00 2001
From: Chris Hoge <chris.hoge@puppetlabs.com>
Date: Thu, 1 May 2014 10:11:16 -0700
Subject: [PATCH] 4.0.0 - 2014.1.0 - Icehouse Release

Updated Modulefile and README.md for 4.0.0 release.

Change-Id: If2b460aa971fb29b426298d8b70ab2099690059d
---
 Modulefile |  4 ++--
 README.md  | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Modulefile b/Modulefile
index 71f4284f..7b55f652 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-cinder'
-version '4.0.0-devel'
+version '4.0.0'
 source  'https://github.com/stackforge/puppet-cinder'
 author  'Puppet Labs'
 license 'Apache License 2.0'
@@ -10,6 +10,6 @@ project_page 'https://launchpad.net/puppet-cinder'
 dependency 'dprince/qpid', '>=1.0.0 <2.0.0'
 dependency 'puppetlabs/inifile', '>=1.0.0 <2.0.0'
 dependency 'puppetlabs/keystone', '>=4.0.0 <5.0.0'
-dependency 'puppetlabs/mysql', '>=0.9.0 <1.0.0'
+dependency 'puppetlabs/mysql', '>=0.9.0 <3.0.0'
 dependency 'puppetlabs/rabbitmq', '>=2.0.2 <3.0.0'
 dependency 'puppetlabs/stdlib', '>=3.2.0'
diff --git a/README.md b/README.md
index 977a8518..00ac6ddb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 cinder
 =======
 
+4.0.0 - 2014.1.0 - Icehouse
+
 #### Table of Contents
 
 1. [Overview - What is the cinder module?](#overview)
@@ -177,13 +179,24 @@ Contributors
 Release Notes
 -------------
 
-**master**
+**4.0.0**
 
+* Stable Icehouse release.
 * Updated NetApp unified driver config options.
+* Updated support for latest RabbitMQ module.
 * Added Glance support.
 * Added GlusterFS driver support.
-* Updated support for latest RabbitMQ module.
+* Added region support.
 * Added support for MySQL module (>= 2.2).
+* Added support for Swift and Ceph backup backend.
+* Added cinder::config to handle additional custom options.
+* Refactored duplicate code for single and multiple backends.
+* Removed control exchange flag.
+* Removed deprecated cinder::base class.
+
+**3.1.1**
+
+* Fixed resource duplication bug.
 
 **3.1.0**