1.2.0 prep

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8c3f3ebf1646569cd255a1321ed017de9380a1f..cc85c88c05f9bb01cc7c380ad94944299c266ef8 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,26 @@
+##2014-11-04 - Supported Release 1.2.0
+###Summary
+
+This release has a number of new features and bugfixes, including rule inversion, future parser support, improved EL7 support, and the ability to purge ip6tables rules.
+
+####Features
+- Documentation updates!
+- Test updates!
+- Add ipset support
+- Enable rule inversion
+- Future parser support
+- Improved support for EL7
+- Support netfilter-persistent
+- Add support for statistics module
+- Add support for mac address source rules
+- Add cbt protocol
+
+####Bugfixes
+- Incorrect use of `source => :iptables` in the ip6tables provider was making it impossible to purge ip6tables rules (MODULES-41)
+- Don't require `toports` when `jump => 'REDIRECT'` (MODULES-1086)
+- Don't limit which chains iniface and outiface parameters can be used in
+- Don't fail on rules added with ipsec/strongswan (MODULES-796)
+
 ##2014-07-08 - Supported Release 1.1.3
 ###Summary
 This is a supported release with test coverage enhancements.

diff --git a/metadata.json b/metadata.json
index eae9ac8e92ee5bf780a749e83e5148ea06c31074..a0ad4523eae876beb2f8e4870a53da5e751536d2 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,12 +1,12 @@
 {
   "name": "puppetlabs-firewall",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "author": "Puppet Labs",
   "summary": "Manages Firewalls such as iptable",
   "license": "Apache-2.0",
   "source": "https://github.com/puppetlabs/puppetlabs-firewall",
-  "project_page": "http://forge.puppetlabs.com/puppetlabs/firewall",
-  "issues_url": "https://github.com/puppetlabs/puppetlabs-firewall/issues",
+  "project_page": "http://github.com/puppetlabs/puppetlabs-firewall",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",