ipset 7.24 releasedv7.24

Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>

3 files changed, 18 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 1de3128..21653e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+7.24
+  - Improve fixing commas in sorted json output
+  - Fix extra quotes around elements in json output
+    (bugzilla #1793, issue 3.)
+  - Fix commas in sorted json output (bugzilla #1793, issue 4)
+  - Fix unquoted port range in json output (bugzilla #1793, issue 1)
+  - Fix extraneous comma in terse list json output (Joachim,
+    bugzilla #1793, issue 2)
+  - bash-completion: restore fix for syntax error (Jeremy Sowden)
+  - Correct typo in man-page (Jeremy Sowden)
+
 7.23
   - tests: runtest.sh: Keep running, print summary of failed tests
     (Phil Sutter)
diff --git a/configure.ac b/configure.ac
index e3dc662..b8e9433 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset],[7.23],[kadlec@netfilter.org])
+AC_INIT([ipset],[7.24],[kadlec@netfilter.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index 262742c..33d2dd3 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,9 @@
+7.24
+  - netfilter: ipset: fix region locking in hash types
+  - Handle "netfilter: ipset: Fix for recursive locking warning"
+    patch for backward compatibility
+  - netfilter: ipset: Fix for recursive locking warning
+
 7.23
   - netfilter: ipset: Hold module reference while requesting a module
     (Phil Sutter)