From b4b3edfcb4434e47aad96a1ee3448b2e974e8cca Mon Sep 17 00:00:00 2001
From: Richard Pijnenburg <richard@ispavailability.com>
Date: Thu, 28 May 2015 10:57:38 +0200
Subject: [PATCH] Version bump

---
 CHANGELOG.md  | 23 +++++++++++++++++++++++
 Modulefile    |  2 +-
 README.md     | 14 ++++++++++++++
 metadata.json |  2 +-
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b491bf02..62c017893 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,26 @@
+##0.9.6 ( May 28, 2015 )
+
+###Summary
+Bugfix release 0.9.6
+
+####Features
+* Implemented package version pinning to avoid accidental upgrading
+* Added support for Debian 8
+* Added support for upgrading plugins
+* Managing LimitNOFILE and LimitMEMLOCK settings in systemd
+
+####Bugfixes
+
+####Changes
+* Dropped official support for PE 3.1.x and 3.2.x
+
+####Testing changes
+* Several testing changes implemented to increase coverage
+
+####Known bugs
+* Possible package conflicts when using ruby/python defines with main package name
+
+
 ##0.9.5( Apr 16, 2015 )
 
 ###Summary
diff --git a/Modulefile b/Modulefile
index 87dd04af6..f926edd9c 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'elasticsearch-elasticsearch'
-version '0.9.5'
+version '0.9.6'
 source 'https://github.com/elastic/puppet-elasticsearch'
 author 'elasticsearch'
 license 'Apache License, Version 2.0'
diff --git a/README.md b/README.md
index 3c921a7f1..9d9ebf436 100644
--- a/README.md
+++ b/README.md
@@ -344,6 +344,20 @@ Note: `init_defaults` hash can be passed to the main class and to the instance.
 
 ##Advanced features
 
+###Package version pinning
+
+The module supports pinning the package version to avoid accidental upgrades that are not done by Puppet.
+To enable this feature:
+
+```puppet
+class { 'elasticsearch':
+  package_pin => true,
+  version     => '1.5.2',
+}
+```
+
+In this example we pin the package version to 1.5.2.
+
 
 ###Data directories
 
diff --git a/metadata.json b/metadata.json
index d2836e1bf..0ff7385f5 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "elasticsearch-elasticsearch",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "source": "https://github.com/elastic/puppet-elasticsearch",
   "author": "elasticsearch",
   "license": "Apache-2.0",