From e2f4712d16920bbf388983a6342e6b03a7347a35 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Fri, 11 Jul 2014 00:37:44 +0200
Subject: [PATCH] Prepare I.1.1.0 release

- Update README & Modulefile
- Add new release to Changelog

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 CHANGELOG.md | 16 ++++++++++++++++
 Modulefile   |  2 +-
 README.md    |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ad99ce4..cbb903d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+##2014-07-15 - Features release 2.1.0
+###Summary
+* Advanced logging support with kibana3, elasticsearch and fluentd
+* Improve SSL termination support
+* File backend support for Glance
+* OpenStack Database as a Service support (Trove) as experimental
+* Pacemaker support in Red-Hat
+* heat-engine is no more managed as a single point of failure
+
+####Bugfixes
+* Fix heat-cfn & heat-cloudwatch HAproxy binding
+* Fix issues when using SSL termination
+
+####Known Bugs
+* No known bugs
+
 ##2014-06-19 - Features release 2.0.0
 ###Summary
 * Icehouse release support
diff --git a/Modulefile b/Modulefile
index a2830ba4..b5bddb0a 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'eNovance-cloud'
-version '2.0.0'
+version '2.1.0'
 source  'https://github.com/enovance/puppet-openstack-cloud'
 author  'eNovance'
 license 'Apache License 2.0'
diff --git a/README.md b/README.md
index c4c09011..f95a83a3 100644
--- a/README.md
+++ b/README.md
@@ -27,12 +27,14 @@ The OpenStack Puppet Modules are a flexible Puppet implementation capable of con
 * [Ceilometer](https://github.com/stackforge/puppet-ceilometer) (telemetry)
 * [Neutron](https://github.com/stackforge/puppet-neutron) (networking)
 * [Swift](https://github.com/stackforge/puppet-swift) (object storage)
+* [Trove](https://github.com/stackforge/puppet-trove) (database as a service)
 
 Cinder, Glance and Nova can use Ceph as backend storage, using [puppet-ceph](https://github.com/enovance/puppet-ceph).
 
 Only KVM and QEMU are supported as hypervisors, for now.
 Neutron use ML2 plugin with GRE and Open-vSwitch drivers.
 Cinder has multi-backend support with Ceph used by default and NetApp as an option.
+Trove support is now experimental.
 
 [Puppet Modules](http://docs.puppetlabs.com/learning/modules1.html#modules) are a collection of related contents that can be used to model the configuration of a discrete service.