From c7f179d9777d75d1e5959c5643160385904a7a6c Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 16 Dec 2014 11:46:19 -0800
Subject: [PATCH 1/2] 3.1.0 prep

---
 CHANGELOG.md  | 22 ++++++++++++++++++++++
 metadata.json |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a85ed788..4c19ec47b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+##2014-12-16 - Supported Release 3.1.0
+###Summary
+
+This release includes several new features, including SLES12 support, and a number of bug fixes.
+
+####Notes
+
+`mysql::server::mysqltuner` has been refactored to fetch the mysqltuner script from github by default. If you are running on a non-network-connected system, you will need to download that file and have it available to your node at a path specified by the `source` parameter to the `mysqltuner` class.
+
+####Features
+- Add support for install_options for all package resources (MODULES-1484)
+- Add log-bin directory creation
+- Allow mysql::db to import multiple files (MODULES-1338)
+- SLES12 support
+- Improved identifier quoting detections
+- Reworked `mysql::server::mysqltuner` so that we are no longer packaging the script as it is licensed under the GPL.
+
+####Bugfixes
+- Fix regression in username validation
+- Proper containment for mysql::client in mysql::db
+- Support quoted usernames of length 15 and 16 chars
+
 ##2014-11-11 - Supported Release 3.0.0
 ###Summary
 
diff --git a/metadata.json b/metadata.json
index bbead09ea..04b262d73 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,9 +1,9 @@
 {
   "name": "puppetlabs-mysql",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "author": "Puppet Labs",
   "summary": "Installs, configures, and manages the MySQL service.",
-  "license": "Apache 2.0",
+  "license": "Apache-2.0",
   "source": "git://github.com/puppetlabs/puppetlabs-mysql.git",
   "project_page": "http://github.com/puppetlabs/puppetlabs-mysql",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",

From b12890da3ca1c21beb234e6b596313ba6904cec3 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 16 Dec 2014 16:46:47 -0800
Subject: [PATCH 2/2] Forgot to add SLES12 to metadata. yay.

---
 metadata.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 04b262d73..1f3188f2c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -44,7 +44,8 @@
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
         "10 SP4",
-        "11 SP1"
+        "11 SP1",
+        "12"
       ]
     },
     {