Merge pull request #444 from mhaskel/merge_1.3.x_into_master

cmurphy · cmurphy · commit e7ea2859b208 · 2014-12-16T17:07:12.000-08:00
Merge 1.3.x into master
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+##2014-12-16 - Supported Release 1.3.0
+###Summary
+
+This release includes a number of bugfixes and features, including fixing `tcp_flags` support, and added support for interface aliases, negation for iniface and outiface, and extra configurability for packages and service names.
+
+####Features
+- Add support for interface aliases (eth0:0) (MODULES-1469)
+- Add negation for iniface, outiface (MODULES-1470)
+- Make package and service names configurable (MODULES-1309)
+
+####Bugfixes
+- Fix test regexes for EL5 (MODULES-1565)
+- Fix `tcp_flags` support for ip6tables (MODULES-556)
+- Don't arbitrarily limit `set_mark` for certain chains
+
 ##2014-11-04 - Supported Release 1.2.0
 ###Summary
 
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-firewall",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "author": "Puppet Labs",
   "summary": "Manages Firewalls such as iptable",
   "license": "Apache-2.0",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "puppetlabs-firewall",`
`3`		`- "version": "1.2.0",`
	`3`	`+ "version": "1.3.0",`
`4`	`4`	`"author": "Puppet Labs",`
`5`	`5`	`"summary": "Manages Firewalls such as iptable",`
`6`	`6`	`"license": "Apache-2.0",`