Merge pull request #472 from puppetlabs/release-prep

Release prep v6.0.0
puppetlabs · Mar 29, 2021 · cfcdc23 · cfcdc23
2 parents 816b786 + 075e1b5
commit cfcdc23
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ All notable changes to this project will be documented in this file. The format
 ### Fixed
 
 - \(bugfix\) backend: dont log warnings if not necessary [\#449](https://github.com/puppetlabs/puppetlabs-haproxy/pull/449) ([bastelfreak](https://github.com/bastelfreak))
+- frontend options: order default\_backend after specific backends & test [\#447](https://github.com/puppetlabs/puppetlabs-haproxy/pull/447) ([MajorFlamingo](https://github.com/MajorFlamingo))
 
 ## [v4.3.0](https://github.com/puppetlabs/puppetlabs-haproxy/tree/v4.3.0) (2020-09-18)
 
@@ -41,7 +42,6 @@ All notable changes to this project will be documented in this file. The format
 
 ### Fixed
 
-- frontend options: order default\_backend after specific backends & test [\#447](https://github.com/puppetlabs/puppetlabs-haproxy/pull/447) ([MajorFlamingo](https://github.com/MajorFlamingo))
 - \(IAC-988\) - Removal of inappropriate terminology [\#443](https://github.com/puppetlabs/puppetlabs-haproxy/pull/443) ([david22swan](https://github.com/david22swan))
 
 ## [v4.2.1](https://github.com/puppetlabs/puppetlabs-haproxy/tree/v4.2.1) (2020-05-19)

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-haproxy",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "author": "puppetlabs",
   "summary": "Configures HAProxy servers and manages the configuration of backend member servers.",
   "license": "Apache-2.0",