Prepare release 3.1.4

Fixes: #235, #223, #184, #94, #143, #248, #249, #231, #217, #221
firehol · Aug 20, 2017 · 571b3b0 · 571b3b0
1 parent 22c5aca
commit 571b3b0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,25 @@
+firehol (3.1.4) - 2017-08-20
+
+  * FireHOL
+
+    - Google hangouts port range fix #235
+    - Fix hashlimit option names #223
+    - Documentation improvements, marks #184 and cthelper #94
+    - Allow negating interface in blacklist #143
+
+  * FireQOS
+
+    - DSCP match fixes #248
+    - TCP match fix #249
+    - Improve docs on using act_connmark to match ingress marked traffic #231
+
+  * Update-Ipsets
+
+    - Added various lists, removed discontinued ones
+    - Include URL in user agent string in #217
+    - Relax umask to allow stats collection by netdata #221
+
+
 firehol (3.1.3) - 2017-02-17
 
   * FireHOL

diff --git a/THANKS b/THANKS
@@ -16,3 +16,5 @@ Tomáš Jacík <sunfox@sunfox.cz>
 Michael Mol <mikemol@gmail.com>
 Alon Bar-Lev <alon.barlev@gmail.com>
 Andreas Unterkircher <unki@netshadow.at>
+Michael Coburn <michael.coburn@percona.com>
+Jonny Tyers <jonnyt886@gmail.com>
diff --git a/configure.ac b/configure.ac
@@ -6,7 +6,7 @@ dnl Package version
 define([VERSION_MAJOR], [3])
 define([VERSION_MINOR], [1])
 define([VERSION_FIX], [4])
-define([VERSION_SUFFIX], [_master])
+define([VERSION_SUFFIX], [])
 
 dnl Required program versions
 define([MIN_IPRANGE_VERSION], [1.0.2])