aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Meusel <tim@bastelfreak.de>2019-10-08 15:57:03 +0200
committerGitHub <noreply@github.com>2019-10-08 15:57:03 +0200
commite669465ba88e96fbed5256d6b0cf31f844aef8e7 (patch)
tree5e14de159ab4de6df78d496d188998b7c23009e6
parent359ae5e922910884b8c5639b52293b05e1183def (diff)
parent7f56b1b8f646266b537106046f3b7bd5f8f3f973 (diff)
downloadpuppet-ferm-e669465ba88e96fbed5256d6b0cf31f844aef8e7.tar.gz
puppet-ferm-e669465ba88e96fbed5256d6b0cf31f844aef8e7.tar.bz2
Merge pull request #86 from bastelfreak/rel260
release 2.6.0
-rw-r--r--CHANGELOG.md19
-rw-r--r--metadata.json2
2 files changed, 20 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4a15b2..496f846 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file.
Each new release typically also includes the latest modulesync defaults.
These should not affect the functionality of the module.
+## [v2.6.0](https://github.com/voxpupuli/puppet-ferm/tree/v2.6.0) (2019-10-08)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-ferm/compare/v2.5.0...v2.6.0)
+
+**Implemented enhancements:**
+
+- implement ipset support [\#80](https://github.com/voxpupuli/puppet-ferm/pull/80) ([bastelfreak](https://github.com/bastelfreak))
+
+**Fixed bugs:**
+
+- ipset: allow multiple instances of defined resource [\#85](https://github.com/voxpupuli/puppet-ferm/pull/85) ([bastelfreak](https://github.com/bastelfreak))
+- disable conntrack filtering in FORWARD/OUTPUT [\#81](https://github.com/voxpupuli/puppet-ferm/pull/81) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- update docker firewalling example [\#84](https://github.com/voxpupuli/puppet-ferm/pull/84) ([bastelfreak](https://github.com/bastelfreak))
+- delete legacy docs/ folder [\#83](https://github.com/voxpupuli/puppet-ferm/pull/83) ([bastelfreak](https://github.com/bastelfreak))
+- move common from hiera data values to init.pp [\#75](https://github.com/voxpupuli/puppet-ferm/pull/75) ([Dan33l](https://github.com/Dan33l))
+
## [v2.5.0](https://github.com/voxpupuli/puppet-ferm/tree/v2.5.0) (2019-09-13)
[Full Changelog](https://github.com/voxpupuli/puppet-ferm/compare/v2.4.0...v2.5.0)
diff --git a/metadata.json b/metadata.json
index 7590448..5df8560 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
{
"name": "puppet-ferm",
- "version": "2.5.1-rc0",
+ "version": "2.6.0",
"author": "Vox Pupuli",
"summary": "deploy and manage ferm",
"license": "AGPL-3.0",