From a3ad293fca9e24f317450fdf14916c3d3d27de45 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Thu, 13 Feb 2014 21:27:28 +0000
Subject: [PATCH] Prepare 2.2.0 release.

---
 CHANGELOG     | 33 +++++++++++++++++++++++++++++++++
 Modulefile    |  2 +-
 metadata.json |  2 +-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f8db81d..c874451 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,36 @@
+2014-02-13 - Version 2.2.0
+
+Summary:
+
+Features:
+- Add `backupdirmode`, `backupdirowner`, `backupdirgroup` to
+  mysql::server::backup to allow customizing the mysqlbackupdir.
+- Support multiple options of the same name, allowing you to
+  do 'replicate-do-db' => ['base1', 'base2', 'base3'] in order to get three
+  lines of replicate-do-db = base1, replicate-do-db = base2 etc.
+- 
+
+Bugfixes:
+- Fix `restart` so it actually stops mysql restarting if set to false.
+- DRY out the defaults_file functionality in the providers.
+- mysql_grant fixed to work with root@localhost/@.
+- mysql_grant fixed for WITH MAX_QUERIES_PER_HOUR
+- mysql_grant fixed so revoking all privileges accounts for GRANT OPTION
+- mysql_grant fixed to remove duplicate privileges.
+- mysql_grant fixed to handle PROCEDURES when removing privileges.
+- mysql_database won't try to create existing databases, breaking replication.
+- bind_address renamed bind-address in 'mysqld' options.
+- key_buffer renamed to key_buffer_size.
+- log_error renamed to log-error.
+- pid_file renamed to pid-file.
+- Ensure mysql::server:root_password runs before mysql::server::backup
+- Fix options_override -> override_options in the README.
+- Extensively rewrite the README to be accurate and awesome.
+
+- Move to requiring stdlib 3.2.0, shipped in PE3.0
+- Add many new tests.
+
+
 2013-11-13 - Version 2.1.0
 
 Summary:
diff --git a/Modulefile b/Modulefile
index 2c160e0..cc92b6f 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name 'puppetlabs-mysql'
-version '2.1.0'
+version '2.2.0'
 source 'git://github.com/puppetlabs/puppetlabs-mysql.git'
 author 'Puppet Labs'
 license 'Apache 2.0'
diff --git a/metadata.json b/metadata.json
index c5041ba..7a0e922 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "puppetlabs/mysql",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "summary": "Manage MySQL, includes types/providers",
     "source": "git@github.com/puppetlabs/puppetlabs-mysql.git",
     "project_page": "http://github.com/puppetlabs/puppetlabs-mysql",