Skip to content

Commit

Permalink
Merge pull request #491 from puppetlabs/release-prep
Browse files Browse the repository at this point in the history
Release prep v6.1.0
  • Loading branch information
daianamezdrea authored Jul 6, 2021
2 parents ea6d51e + 6bd73d0 commit a9c2e73
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

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).

## [v6.1.0](https://github.com/puppetlabs/puppetlabs-haproxy/tree/v6.1.0) (2021-07-06)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-haproxy/compare/v6.0.2...v6.1.0)

### Added

- allow type 'default-server' for balancermember [\#489](https://github.com/puppetlabs/puppetlabs-haproxy/pull/489) ([trefzer](https://github.com/trefzer))
- Use Puppet-Datatype Sensitive [\#487](https://github.com/puppetlabs/puppetlabs-haproxy/pull/487) ([cocker-cc](https://github.com/cocker-cc))

## [v6.0.2](https://github.com/puppetlabs/puppetlabs-haproxy/tree/v6.0.2) (2021-06-21)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-haproxy/compare/v6.0.1...v6.0.2)
Expand Down
6 changes: 3 additions & 3 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ Default value: `'haproxy'`

##### <a name="type"></a>`type`

Data type: `Any`
Data type: `Enum['server', 'default-server', 'server-template']`

Optional. Defaults to 'server'

Expand Down Expand Up @@ -1847,7 +1847,7 @@ Default value: `$name`

##### <a name="users"></a>`users`

Data type: `Any`
Data type: `Optional[Array[Variant[String, Sensitive[String]]]]`

An array of users in the userlist.
See http://cbonte.github.io/haproxy-dconv/configuration-1.4.html#3.4-user
Expand All @@ -1856,7 +1856,7 @@ Default value: ``undef``

##### <a name="groups"></a>`groups`

Data type: `Any`
Data type: `Optional[Array[String]]`

An array of groups in the userlist.
See http://cbonte.github.io/haproxy-dconv/configuration-1.4.html#3.4-group
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-haproxy",
"version": "6.0.2",
"version": "6.1.0",
"author": "puppetlabs",
"summary": "Configures HAProxy servers and manages the configuration of backend member servers.",
"license": "Apache-2.0",
Expand Down

0 comments on commit a9c2e73

Please sign in to comment.