summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-07-11 11:10:47 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-07-11 11:10:47 +0200
commitcdb6bb6cf01909e84bae99af0d83946884f24611 (patch)
tree9983bcf69b556f7b7ed3a226d19e426afcb56807
parent7aec98853ae3fab8cedfb557c30bac361c08764f (diff)
ipset 6.8 releasedv6.8
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog7
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b7920da..f642d44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+6.8
+ - Update the manpage and document the limits in hash:net,iface.
+ - README file corrections from Richard Lucassen
+
6.7
- Whitespace and coding fixes, detected by checkpatch.pl
- hash:net,iface type introduced
diff --git a/configure.ac b/configure.ac
index 107ba02..0e92b1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.7], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.8], [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 b74de49..00fdf30 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,10 @@
+6.8
+ - Fix compiler warnings "'hash_ip4_data_next' declared inline after being
+ called" (Chris Friesen)
+ - hash:net,iface fixed to handle overlapping nets behind different
+ interfaces
+ - Make possible to hash some part of the data element only.
+
6.7
- Whitespace and coding fixes, detected by checkpatch.pl
- hash:net,iface type introduced