From f66b782f9861ee1de0e5af9552e6db47c5ed414a Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Tue, 13 May 2014 12:27:15 -0400
Subject: [PATCH] Prepare 1.1.0 release.

---
 CHANGELOG.md  | 35 +++++++++++++++++++++++++++++++++++
 Modulefile    |  2 +-
 metadata.json |  2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6c93cf..c04ed77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,38 @@
+## 2014-05-13 Release 1.1.0
+###Summary
+
+This release has a significant change from previous releases; we now apply the
+firewall resources alphabetically by default, removing the need to create pre
+and post classes just to enforce ordering.  It only effects default ordering
+and further information can be found in the README about this.  Please test
+this in development before rolling into production out of an abundance of
+caution.
+
+We've also added `mask` which is required for --recent in recent (no pun
+intended) versions of iptables, as well as connlimit and connmark.  This
+release has been validated against Ubuntu 14.04 and RHEL7 and should be fully
+working on those platforms.
+
+####Features
+
+- Apply firewall resources alphabetically. 
+- Add support for connlimit and connmark.
+- Add `mask` as a parameter. (Used exclusively with the recent parameter).
+
+####Bugfixes
+
+- Add systemd support for RHEL7.
+- Replace &&'s with the correct and in manifests.
+- Fix tests on Trusty and RHEL7
+- Fix for Fedora Rawhide.
+- Fix boolean flag tests.
+- Fix DNAT->SNAT typo in an error message.
+
+####Known Bugs
+
+* For Oracle, the `owner` and `socket` parameters require a workaround to function. Please see the Limitations section of the README.
+
+
 ## 2014-03-04 Supported Release 1.0.2
 ###Summary
 
diff --git a/Modulefile b/Modulefile
index 4583172..56fde2c 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name 'puppetlabs-firewall'
-version '1.0.2'
+version '1.1.0'
 source 'git://github.com/puppetlabs/puppetlabs-firewall.git'
 author 'puppetlabs'
 license 'ASL 2.0'
diff --git a/metadata.json b/metadata.json
index f4c45a6..8060984 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "puppetlabs-firewall",
-    "version": "1.0.2",
+    "version": "1.1.0",
     "source": "https://github.com/puppetlabs/puppetlabs-firewall",
     "author": "Puppet Labs",
     "license": "Apache-2.0",
-- 
2.45.2