Merge pull request #755 from mhaskel/3.6.1-prep

hunner · hunner · commit 58bb3b92d88c · 2015-08-31T16:46:30.000-07:00
3.6.1 prep
diff --git 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
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "puppetlabs-mysql",`
`3`		`- "version": "3.6.0",`
	`3`	`+ "version": "3.6.1",`
`4`	`4`	`"author": "Puppet Labs",`
`5`	`5`	`"summary": "Installs, configures, and manages the MySQL service.",`
`6`	`6`	`"license": "Apache-2.0",`