From f1f47f4311be3d05cd185f174c0047bd9f6f5af4 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Mon, 10 Aug 2015 14:57:07 -0700
Subject: [PATCH] Prep 3.6.0

---
 CHANGELOG.md  | 14 ++++++++++++++
 README.md     |  7 +++++--
 metadata.json |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3e113f..872bf3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 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.
+
+#### Features
+- Add ability to use mysql::db WITHOUT mysql::server (ie, externally)
+- Add prescript attribute to mysql::server::backup for xtrabackup
+- Add postscript ability to xtrabackup provider.
+
+#### Bugfixes
+- Fix default root passwords blocking puppet on mysql 5.8
+- Fix service dependency when package_manage is false
+- Fix selinux permissions on my.cnf
+
 ##2015-07-23 - Supported Release 3.5.0
 ###Summary
 A small release to add explicit support to newer Puppet versions and accumulated patches.
diff --git a/README.md b/README.md
index 4bb0a1c..c09e5ba 100644
--- a/README.md
+++ b/README.md
@@ -416,7 +416,11 @@ An array of two elements to set the backup time. Allows ['23', '5'] (i.e., 23:05
 
 #####`postscript`
 
-A script that is executed at when the backup is finished. This could be used to (r)sync the backup to a central store. This script can be either a single line that is directly executed or a number of lines supplied as an array. It could also be one or more externally managed (executable) files.
+A script that is executed when the backup is finished. This could be used to (r)sync the backup to a central store. This script can be either a single line that is directly executed or a number of lines supplied as an array. It could also be one or more externally managed (executable) files.
+
+#####`prescript`
+
+A script that is executed before the backup begins.
 
 #####`provider`
 
@@ -819,7 +823,6 @@ This module has been tested on:
 * Ubuntu 10.04, 12.04, 14.04
 * Scientific Linux 5, 6
 * SLES 11
-* Solaris 11.2, 11.3, 12.0
 
 Testing on other platforms has been minimal and cannot be guaranteed.
 
diff --git a/metadata.json b/metadata.json
index 2b78d8b..a226e1b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-mysql",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "author": "Puppet Labs",
   "summary": "Installs, configures, and manages the MySQL service.",
   "license": "Apache-2.0",