From 317fc9cc1cd4fbabad5401ce0c20d9535977361b Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 21 Jun 2021 16:02:25 +0000 Subject: [PATCH] Release prep v11.0.3 --- CHANGELOG.md | 8 ++++++++ REFERENCE.md | 22 ++++++---------------- metadata.json | 2 +- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfaa3508b..f7755c307 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ 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). +## [v11.0.3](https://github.com/puppetlabs/puppetlabs-mysql/tree/v11.0.3) (2021-06-21) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v11.0.2...v11.0.3) + +### Fixed + +- \(IAC-1430\) - Minor docs updating [\#1401](https://github.com/puppetlabs/puppetlabs-mysql/pull/1401) ([pmcmaw](https://github.com/pmcmaw)) + ## [v11.0.2](https://github.com/puppetlabs/puppetlabs-mysql/tree/v11.0.2) (2021-06-07) [Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v11.0.1...v11.0.2) diff --git a/REFERENCE.md b/REFERENCE.md index 505cbed76..5b38b976f 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -58,15 +58,14 @@ ### Functions -* [`mysql::normalise_and_deepmerge`](#mysqlnormalise_and_deepmerge): Recursively merges two or more hashes together, normalises keys with differing use of dashesh and underscores, -then returns the resulting hash. +* [`mysql::normalise_and_deepmerge`](#mysqlnormalise_and_deepmerge): Recursively merges two or more hashes together, normalises keys with differing use of dashes and underscores. * [`mysql::password`](#mysqlpassword): Hash a string as mysql's "PASSWORD()" function would do it * [`mysql::strip_hash`](#mysqlstrip_hash): When given a hash this function strips out all blank entries. * [`mysql_password`](#mysql_password): DEPRECATED. Use the namespaced function [`mysql::password`](#mysqlpassword) instead. ### Data types -* [`Mysql::Options`](#mysqloptions) +* [`Mysql::Options`](#mysqloptions): A hash of options structured like the override_options, but not merged with the default options. ### Tasks @@ -382,8 +381,6 @@ The following parameters are available in the `mysql::client` class: * [`install_options`](#install_options) * [`package_ensure`](#package_ensure) * [`package_manage`](#package_manage) -* [`service_name`](#service_name) -* [`service_provider`](#service_provider) * [`package_name`](#package_name) * [`package_provider`](#package_provider) * [`package_source`](#package_source) @@ -420,14 +417,6 @@ Whether to manage the MySQL client package. Defaults to `true`. Default value: `$mysql::params::client_package_manage` -##### `service_name` - -The name of the MySQL server service. Defaults are OS dependent, defined in 'params.pp'. - -##### `service_provider` - -The provider to use to manage the service. For Ubuntu, defaults to 'upstart'; otherwise, default is undefined. - ##### `package_name` Data type: `Any` @@ -1621,7 +1610,8 @@ $merged_hash = mysql::normalise_and_deepmerge($hash1, $hash2) - When there is a duplicate key that is not a hash, the key in the rightmost hash will "win." - When there are conficting uses of dashes and underscores in two keys (which mysql would otherwise equate), the rightmost style will win. -Returns: `Any` +Returns: `Any` hash +The given hash normalised ##### Examples @@ -1639,7 +1629,7 @@ $merged_hash = mysql::normalise_and_deepmerge($hash1, $hash2) Data type: `Any` - +Hash to be normalised ### `mysql::password` @@ -1701,7 +1691,7 @@ Plain text password. ### `Mysql::Options` -The Mysql::Options data type. +Use this if you don’t want your options merged with the default options. Alias of diff --git a/metadata.json b/metadata.json index 950b0d550..555f53300 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-mysql", - "version": "11.0.2", + "version": "11.0.3", "author": "puppetlabs", "summary": "Installs, configures, and manages the MySQL service.", "license": "Apache-2.0",