summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2013-04-14 20:17:32 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2013-04-14 20:17:32 +0200
commit636baea28932f560ab61fe6c1050389c22111965 (patch)
tree37f76b411c40b3b061e286f7afbb498a80629dc5
parent275250fe3b5a9c582f9391da141ae4840fae53cd (diff)
ipset 6.18 releasedv6.18ipset-6.18
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog5
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 59c0ef9..574c335 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+6.18
+ -
+
6.17
- Fix revision printing in XML mode (reported by Mart Frauenlob)
- Correct "Suspicious condition (assignment + comparison)" (Thomas Jarosch)
diff --git a/configure.ac b/configure.ac
index a86d596..4e22323 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.17], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.18], [kadlec@blackhole.kfki.hu])
AC_CONFIG_AUX_DIR([build-aux])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index b9ca38c..425526a 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,8 @@
+6.18
+ - bitmap:ip,mac: fix listing with timeout (reported by Yoann JUET)
+ - hash:*net*: nomatch flag not excluded on set resize
+ - list:set: update reference counter when last element pushed off
+
6.17
- Make sure ip_set_max isn't set to IPSET_INVALID_ID
- netfilter: ipset: timeout values corrupted on set resize (Josh Hunt)