Merge pull request #456 from apenney/221-release

hunner · hunner · commit d2eea45749d7 · 2014-02-19T08:58:30.000-08:00
Prepare 2.2.1 release.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,13 @@
+2014-02-19 - Version 2.2.1
+
+Summary:
+
+Minor release that repairs mysql_database{} so that it sees the correct
+collation settings (it was only checking the global mysql ones, not the
+actual database and constantly setting it over and over since January 22nd).
+
+Also fixes a bunch of tests on various platforms.
+
 2014-02-13 - Version 2.2.0
 
 Summary:
diff --git a/Modulefile b/Modulefile
@@ -1,5 +1,5 @@
 name 'puppetlabs-mysql'
-version '2.2.0'
+version '2.2.1'
 source 'git://github.com/puppetlabs/puppetlabs-mysql.git'
 author 'Puppet Labs'
 license 'Apache 2.0'
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "puppetlabs/mysql",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "summary": "Manage MySQL, includes types/providers",
     "source": "git@github.com/puppetlabs/puppetlabs-mysql.git",
     "project_page": "http://github.com/puppetlabs/puppetlabs-mysql",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "puppetlabs/mysql",`
`3`		`- "version": "2.2.0",`
	`3`	`+ "version": "2.2.1",`
`4`	`4`	`"summary": "Manage MySQL, includes types/providers",`
`5`	`5`	`"source": "git@github.com/puppetlabs/puppetlabs-mysql.git",`
`6`	`6`	`"project_page": "http://github.com/puppetlabs/puppetlabs-mysql",`