5.4.0 mergeback

CHANGELOG.md

@@ -1,7 +1,19 @@
-# Change log
+# Changelog
 
-All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org).
+All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
+
+## [5.4.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/5.4.0)
+
+### Added
+
+- \(PDOC-210\) Puppet Strings documentation [\#1068](https://github.com/puppetlabs/puppetlabs-mysql/pull/1068) ([hunner](https://github.com/hunner))
+- Compatibility for Alpine linux [\#1049](https://github.com/puppetlabs/puppetlabs-mysql/pull/1049) ([cisco87](https://github.com/cisco87))
+
+### Fixed
+
+- \(MODULES-6627\) Removed unused --host flag from mysqlcaller [\#1064](https://github.com/puppetlabs/puppetlabs-mysql/pull/1064) ([HelenCampbell](https://github.com/HelenCampbell))
+- Fixed archlinux compatibility [\#1057](https://github.com/puppetlabs/puppetlabs-mysql/pull/1057) ([bastelfreak](https://github.com/bastelfreak))
+- Changed input param option in export.json from sql to file [\#1054](https://github.com/puppetlabs/puppetlabs-mysql/pull/1054) ([cgoswami](https://github.com/cgoswami))
 
 ## Supported Release [5.3.0]
 ### Summary
@@ -878,6 +890,7 @@ configuration variables.
 ## 2011-06-03 - Dan Bode <[email protected]> - 0.0.1
 * initial commit
 
+[5.4.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.3.0...5.4.0
 [5.3.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.2.1...5.3.0
 [5.2.1]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.2.0...5.2.1
 [5.2.0]:https://github.com/puppetlabs/puppetlabs-mysql/compare/5.1.0...5.2.0

REFERENCE.md

@@ -1,4 +1,5 @@
 # Reference
+<!-- DO NOT EDIT: This document was generated by Puppet Strings -->
 
 ## Classes
 
@@ -30,8 +31,7 @@
 * `mysql::server::config`: Private class for MySQL server configuration.
 * `mysql::server::install`: Private class for managing MySQL package.
 * `mysql::server::installdb`: Builds initial databases on installation.
-* `mysql::server::providers`: Convenience class to call each of the three providers with the corresponding
-hashes provided in mysql::server.
+* `mysql::server::providers`: Convenience class to call each of the three providers with the corresponding hashes provided in mysql::server.
 * `mysql::server::root_password`: Private class for managing the root password
 * `mysql::server::service`: Private class for managing the MySQL service
 

manifests/server/providers.pp

@@ -1,6 +1,5 @@
 # @summary
-#   Convenience class to call each of the three providers with the corresponding
-#   hashes provided in mysql::server.
+#   Convenience class to call each of the three providers with the corresponding hashes provided in mysql::server.
 #
 # @api private
 #

metadata.json

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