aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Meusel <tim@bastelfreak.de>2018-03-17 19:59:55 +0100
committerTim Meusel <tim@bastelfreak.de>2018-03-17 19:59:55 +0100
commit299321eca9e48c9a4f8d9a348b1e7c8abc275885 (patch)
tree08df726a237211840c321e43e829fe01db7462d5
parentcce6205cf0906f75dd30840dde6fb982d5268b09 (diff)
downloadpuppet-ferm-299321eca9e48c9a4f8d9a348b1e7c8abc275885.tar.gz
puppet-ferm-299321eca9e48c9a4f8d9a348b1e7c8abc275885.tar.bz2
release 1.2.0
-rw-r--r--CHANGELOG.md13
-rw-r--r--metadata.json2
2 files changed, 14 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 142a9ac..c192e3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@ 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.
+## [v1.2.0](https://github.com/voxpupuli/puppet-ferm/tree/v1.2.0) (2018-03-17)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-ferm/compare/v1.1.1...v1.2.0)
+
+**Implemented enhancements:**
+
+- Make usage of conntrack optional [\#9](https://github.com/voxpupuli/puppet-ferm/issues/9)
+- introduce parameter disable\_conntrack [\#10](https://github.com/voxpupuli/puppet-ferm/pull/10) ([kBite](https://github.com/kBite))
+
+**Merged pull requests:**
+
+- release 1.1.1 [\#8](https://github.com/voxpupuli/puppet-ferm/pull/8) ([bastelfreak](https://github.com/bastelfreak))
+
## [v1.1.1](https://github.com/voxpupuli/puppet-ferm/tree/v1.1.1) (2018-03-15)
[Full Changelog](https://github.com/voxpupuli/puppet-ferm/compare/2d355a4c1baadc761d6b12645d0274da8866f722...v1.1.1)
diff --git a/metadata.json b/metadata.json
index d1de326..256cd7d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
{
"name": "puppet-ferm",
- "version": "1.1.2-rc0",
+ "version": "1.2.0",
"author": "Vox Pupuli",
"summary": "deploy and manage ferm",
"license": "AGPL-3.0",