Merge pull request #684 from mhaskel/merge_3.3.x_to_master

Merge 3.3.x to master

Author: cmurphy

CHANGELOG.md

@@ -1,3 +1,16 @@
+##2015-03-03 - Supported Release 3.3.0
+###Summary
+This release includes major README updates, the addition of backup providers, and a fix for managing the log-bin directory.
+
+####Features
+- Add package_manage parameters to `mysql::server` and `mysql::client` (MODULES-1143)
+- README improvements
+- Add `mysqldump`, `mysqlbackup`, and `xtrabackup` backup providers.
+
+####Bugfixes
+- log-error overrides were not being properly used (MODULES-1804)
+- check for full path for log-bin to stop puppet from managing file '.'
+
 ##2015-02-09 - Supported Release 3.2.0
 ###Summary
 This release includes several new features and bugfixes, including support for various plugins, making the output from mysql_password more consistent when input is empty and improved username validation.

README.md

@@ -10,6 +10,7 @@
 4. [Usage - Configuration options and additional functionality](#usage)
     * [Customizing Server Options](#customizing-server-options)
     * [Creating a Database](#creating-a-database)
+    * [Custom Configuration](#custom-configuration)
 5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
 5. [Limitations - OS compatibility, etc.](#limitations)
 6. [Development - Guide for contributing to the module](#development)
@@ -140,7 +141,7 @@ mysql::db { 'mydb':
 }
 ~~~
 
-###Custom configuration
+###Custom Configuration
 
 To add custom MySQL configuration, drop additional files into
 `includedir`. Dropping files into `includedir` allows you to override settings or add additional ones, which is helpful if you choose not to use `override_options` in `mysql::server`. The `includedir` location is by default set to /etc/mysql/conf.d.
@@ -412,9 +413,7 @@ The hostname from which the monitoring user requests are allowed access.
 
 ####mysql::server::mysqltuner
 
-***Note***
-
-If using this class on a non-network-connected system you must download the mysqltuner.pl script and have it hosted somewhere accessible via `http(s)://`, `puppet://`, `ftp://`, or a fully qualified file path.
+**Note**: If you're using this class on a non-network-connected system, you must download the mysqltuner.pl script and have it hosted somewhere accessible via `http(s)://`, `puppet://`, `ftp://`, or a fully qualified file path.
 
 ##### `ensure`
 

manifests/server/config.pp

@@ -23,7 +23,7 @@
 
   if $logbin {
     $logbindir = mysql_dirname($logbin)
-    
+
     #Stop puppet from managing directory if just a filename/prefix is specified
     if $logbindir != '.' {
       file { $logbindir:

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-mysql",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "author": "Puppet Labs",
   "summary": "Installs, configures, and manages the MySQL service.",
   "license": "Apache-2.0",