From 21ff298d8ef644beb0f5e5de6e44b6775571cd9e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 27 Feb 2015 18:14:04 +0100
Subject: [PATCH] Release 3.1.0

---
 CHANGELOG.md  | 18 ++++++++++++++++++
 metadata.json |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09652cee..2f0e7a03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## 3.1.0
+ * New parameter `pool_purge` for `php::extension` to remove files not
+   managed by puppet from the pool directory.
+ * The `pecl_source` parameter for `php::extension` was renamend to
+   `source` because it is also useful for PEAR extensions.
+   `pecl_source` can still be used but is deprecated and will be
+   removed in the next major release.
+ * Parameters referring to time in `php::fpm::config` can now be
+   specified with units (i.e. `'60s'`, `'1d'`):
+   * `emergency_restart_threshold`
+   * `emergency_restart_interval`
+   * `process_control_timeout`
+ * The PEAR version is not independant of `$php::ensure` and can be
+   configured with `$php::pear_ensure`
+ * Give special thanks to the contributors of this release:
+   * Petr Sedlacek
+   * Sherlan Moriah
+
 ## 3.0.1
  * Fix typo in package suffix for php-fpm on RHEL in params.pp
 
diff --git a/metadata.json b/metadata.json
index d38c809a..48087ab3 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "mayflower-php",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "author": "Mayflower",
   "summary": "Puppet module to manage PHP",
   "license": "MIT",