summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog5
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ff4970d..e8e9a69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+6.4
+ - Get rid of the trailing empty line at listing sets
+ - Fix XML listing, remove broken unused "elements" tag
+ - Support listing setnames and headers too
+ - Sorting is dependent on the locale settings, use LC_ALL=C
+ - Use unified diff output in tests
+
6.3
- Testsuite changes: keep temporary files
- bitmap:ip,mac type requires "src" for MAC: manpage is updated to reflect
diff --git a/configure.ac b/configure.ac
index 7dc8b2e..7a45df6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.3], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.4], [kadlec@blackhole.kfki.hu])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER([config.h])
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index 2366da4..aa0c58f 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,8 @@
+6.4
+ - Support listing setnames and headers too
+ - Fix the order of listing of sets
+ - Options and flags support added to the kernel API
+
6.3
- ipset/Kconfig was a mixed up kernel config file, fixed (Michael Tokarev)
- bitmap:ip,mac type requires "src" for MAC, enforce it