ipset 6.10 released

diff --git a/ChangeLog b/ChangeLog
index 85a9e2e0155fbb70857ef1e7293d316d20926749..8137cc075b886e7c0d493b8a4a190992a650eaf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+6.10
+ - Tests added to check ICMP/ICMPv6 type/code parsing
+ - ICMP/ICMPv6 type/code parser bug fixed (bug reported by Sabitov)
+ - ipset: fix lookup of tcp port names (Stephen Hemminger)
+ - Optionally disable building the kernel module (Mathieu Bridon)
+ - Make tidy complete
+
 6.9
  - build: move ipset_errcode into library (Jan Engelhardt)
  - build: abort autogen on subcommand failure (Jan Engelhardt)

diff --git a/configure.ac b/configure.ac
index 9ad8bedd5626055efad55f70c42b61e3055e8287..692f740df8c44105369514afa89cc4597974c169 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset], [6.9.1], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.10], [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 c6b3537285beb1ec2ec286960fe4b0ce41e8294b..cf502e698c9b755af94337e12da168fff034a1c0 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,7 @@
+6.10
+ - Invert the logic to include version.h in ip_set_core.c
+ - Suppress false compile-time warnings about uninitialized variable ip_to
+
 6.9.1
  - Fix compiling ipset as external kernel modules