summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2014-03-07 13:22:12 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2014-03-07 13:22:12 +0100
commit7a51d88814b24d3e43488d76dbc4cc78e71ddc81 (patch)
treeeea4d5a612e48bbb1e3fecf7fde57e02fa9aca49
parent063b7cd3bc8c0c8d877f35ac65030dfaa4d9cffc (diff)
ipset 6.21.1 releasedv6.21.1
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog4
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1521cb9..bc29059 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+6.21.1
+ - The bash utilities are updated
+ - Fix libipset library release versioning (reported by Mathieu Bridon)
+
6.21
- ipset: add userspace support for forceadd (Josh Hunt)
- kernel: uapi: fix MARKMASK attr ABI breakage (Florian Westphal)
diff --git a/configure.ac b/configure.ac
index 45129c5..928d88b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.21], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.21.1], [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 25b4e3a..92ef083 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,7 @@
+6.21.1
+ - netfilter: ip_set: rename nfnl_dereference()/nfnl_set()
+ (Patrick McHardy)
+
6.21
- ipset: add forceadd kernel support for hash set types (Josh Hunt)
- netfilter: ipset: move registration message to init from net_init