aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorTim Meusel <tim@bastelfreak.de>2018-03-17 20:05:52 +0100
committerGitHub <noreply@github.com>2018-03-17 20:05:52 +0100
commit67ce2e1d46c9fa7be82a2d776073578a7cf115cc (patch)
tree08df726a237211840c321e43e829fe01db7462d5 /CHANGELOG.md
parent1ed440222ffb00904ffcba97505a887b95c4f3a0 (diff)
parent299321eca9e48c9a4f8d9a348b1e7c8abc275885 (diff)
downloadpuppet-ferm-67ce2e1d46c9fa7be82a2d776073578a7cf115cc.tar.gz
puppet-ferm-67ce2e1d46c9fa7be82a2d776073578a7cf115cc.tar.bz2
Merge pull request #11 from bastelfreak/rel120
Release 1.2.0
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md13
1 files changed, 13 insertions, 0 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)