release 1.2.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 142a9ace104fc20608b2f2e1dd03c2696a24d5e3..c192e3d4144d95f3429815cd08d6e48b97c9638b 100644 (file)
--- 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 d1de326a26b6354dce2ed608e5ab68406bb3e16d..256cd7d897d178c09f61bd1d7b4010e1a9ddb1e5 100644 (file)
--- 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",