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

Updated Modulefile and README.md for 4.0.0 release.

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

diff --git a/Modulefile b/Modulefile
index 355b2ab67..8771f6ec0 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-heat'
-version '4.0.0-devel'
+version '4.0.0'
 source 'https://github.com/stackforge/puppet-heat'
 author 'enovance'
 license 'Apache License, Version 2.0'
@@ -9,5 +9,5 @@ project_page 'https://launchpad.net/puppet-heat'
 
 # Dependencies
 dependency 'puppetlabs/inifile', '>= 1.0.0 <2.0.0'
-dependency 'puppetlabs/mysql', '>=0.9.0 <1.0.0'
+dependency 'puppetlabs/mysql', '>=0.9.0 <3.0.0'
 dependency 'puppetlabs/stdlib', '>= 3.2.0'
diff --git a/README.md b/README.md
index 198779934..ed29043cd 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 puppet-heat
 =============
 
+4.0.0 - 2014.1.0 - Icehouse
+
 #### Table of Contents
 
 1. [Overview - What is the heat module?](#overview)
@@ -66,7 +68,16 @@ Contributors
 Release Notes
 -------------
 
-** 3.1.0 **
+**4.0.0**
+
+* Stable Icehouse release.
+* Added SSL parameter for RabbitMQ.
+* Added support for puppetlabs-mysql 2.2 and greater.
+* Added option to define RabbitMQ queues as durable.
+* Fixed outdated DB connection parameter.
+* Fixed Keystone auth_uri parameter.
+
+**3.1.0**
 
 * Fixed postgresql connection string.
 * Allow log_dir to be set to false to disable file logging.
@@ -75,7 +86,7 @@ Release Notes
 * Fixed the EC2 auth token settings.
 * Fixed rabbit_virtual_host configuration.
 
-** 3.0.0 **
+**3.0.0**
 
 * Initial release of the puppet-heat module.