From f4b49f2c3582ed05b7f1556c2c1448acb8dd3912 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 31 Aug 2015 16:43:46 -0700
Subject: [PATCH] 3.6.1 prep

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 872bf3bc0..dba249f6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 2015-09-08 - Supported Release 3.6.1
+### Summary
+This release fixes an incorrect function used in `mysql::server::backup` and fixes compatibility issues with PE 3.3.x.
+
+#### Bugfixes
+- Use `warning()` not `warn()`
+- Metadata had inadvertantly dropped 3.3.x support
+- Some 3.3.x compatibility issues in `mysqltuner` were corrected
+
 ## 2015-08-10 - Supported Release 3.6.0
 ### Summary
 This release adds the ability to use mysql::db and `mysql_*` types against unmanaged or external mysql instances.
diff --git a/metadata.json b/metadata.json
index a077391fc..f5797e3a8 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-mysql",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "author": "Puppet Labs",
   "summary": "Installs, configures, and manages the MySQL service.",
   "license": "Apache-2.0",