Merge pull request #668 from mhaskel/merge_3.2.x_to_master

Merge 3.2.x to master
xbezdick · Feb 10, 2015 · 7e81906 · 7e81906
2 parents b9fbba3 + f93fbe3
commit 7e81906
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,26 @@
+##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.
+
+####Features
+- Add type and provider to manage plugins
+- Add support for authentication plugins
+- Add support for mysql_install_db on freebsd
+- Add `create_root_user` and `create_root_my_cnf` parameters to `mysql::server`
+
+####Bugfixes
+- Remove dependency on stdlib >= 4.1.0 (MODULES-1759)
+- Make grant autorequire user
+- Remove invalid parameter 'provider' from mysql_user instance (MODULES-1731)
+- Return empty string for empty input in mysql_password
+- Fix `mysql::account_security` when fqdn==localhost
+- Update username validation (MODULES-1520)
+- Future parser fix in params.pp
+- Fix package name for debian 8
+- Don't start the service until the server package is installed and the config file is in place
+- Test fixes
+- Lint fixes
+
 ##2014-12-16 - Supported Release 3.1.0
 ###Summary
 

diff --git a/tests/backup.pp → examples/backup.pp b/tests/backup.pp → examples/backup.pp
diff --git a/tests/bindings.pp → examples/bindings.pp b/tests/bindings.pp → examples/bindings.pp
diff --git a/tests/java.pp → examples/java.pp b/tests/java.pp → examples/java.pp
diff --git a/tests/mysql_database.pp → examples/mysql_database.pp b/tests/mysql_database.pp → examples/mysql_database.pp
diff --git a/tests/mysql_db.pp → examples/mysql_db.pp b/tests/mysql_db.pp → examples/mysql_db.pp
diff --git a/tests/mysql_grant.pp → examples/mysql_grant.pp b/tests/mysql_grant.pp → examples/mysql_grant.pp
diff --git a/tests/mysql_plugin.pp → examples/mysql_plugin.pp b/tests/mysql_plugin.pp → examples/mysql_plugin.pp
@@ -3,16 +3,16 @@
 }
 
 mysql::plugin{ 'validate_password':
-  ensure  => present,
-  soname  => $::osfamily ? {
+  ensure => present,
+  soname => $::osfamily ? {
     windows => 'validate_password.dll',
     default => 'validate_password.so'
   }
 }
 
 mysql::plugin{ 'auth_socket':
-  ensure  => present,
-  soname  => $::osfamily ? {
+  ensure => present,
+  soname => $::osfamily ? {
     windows => 'auth_socket.dll',
     default => 'auth_socket.so'
   }

diff --git a/tests/mysql_user.pp → examples/mysql_user.pp b/tests/mysql_user.pp → examples/mysql_user.pp
@@ -21,8 +21,8 @@
 }
 
 mysql_user{ 'socketplugin@%':
-  ensure        => present,
-  plugin        => 'unix_socket',
+  ensure => present,
+  plugin => 'unix_socket',
 }
 
 mysql_user{ 'socketplugin@%':

diff --git a/tests/perl.pp → examples/perl.pp b/tests/perl.pp → examples/perl.pp
diff --git a/tests/python.pp → examples/python.pp b/tests/python.pp → examples/python.pp
diff --git a/tests/ruby.pp → examples/ruby.pp b/tests/ruby.pp → examples/ruby.pp
diff --git a/tests/server.pp → examples/server.pp b/tests/server.pp → examples/server.pp
diff --git a/tests/server/account_security.pp → examples/server/account_security.pp b/tests/server/account_security.pp → examples/server/account_security.pp
diff --git a/tests/server/config.pp → examples/server/config.pp b/tests/server/config.pp → examples/server/config.pp
diff --git a/manifests/server/account_security.pp b/manifests/server/account_security.pp
@@ -9,8 +9,8 @@
   }
   if ($::fqdn != 'localhost.localdomain') {
     mysql_user {
-      [ "[email protected]",
-        "@localhost.localdomain"]:
+      [ '[email protected]',
+        '@localhost.localdomain']:
       ensure  => 'absent',
       require => Anchor['mysql::server::end'],
     }

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-mysql",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "author": "Puppet Labs",
   "summary": "Installs, configures, and manages the MySQL service.",
   "license": "Apache-2.0",