iptables branch, iptables-next, updated. v1.4.8-27-gb14f160

[Patrick McHardy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "iptables".

The branch, iptables-next has been updated
       via  b14f160c11196aeb99000611207bd353c7ae2cb9 (commit)
       via  b4fa7222923bc10476b8753f358e871f461eb2db (commit)
       via  ce06c99ee107102a7168493b55970b53380ebbb6 (commit)
       via  e4540fcb86c2d7f4cdf51c49872847a03a11b433 (commit)
       via  b1c768168ef1f79c4bdd02f6e681e6e1fbb8d533 (commit)
       via  78514bc3a9b1b724c9fc904941c5854644865673 (commit)
       via  e6d0d94139e826f7b5d8446ce174155c04963b07 (commit)
       via  76f7a230e4182ab2b64a68c9d84437035d925f3b (commit)
       via  dd2bbe0b614ad60fb2e267863471836aae424425 (commit)
       via  6a7696b5eeba301b76da12c77e9b0b5ce448bc6b (commit)
       via  d40f1628c3717daebc437a398a285e371b5b6f7f (commit)
       via  11c2dd54b69e06ae3f35dea130ecba3df3859243 (commit)
       via  0cb675b8f18c4b074d4c69461638820708e98100 (commit)
       via  491c1660fced08e2d1a08c101c63af04250275d0 (commit)
      from  0bcda81f5f6d121084131fb944e2940f614cc98c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b14f160c11196aeb99000611207bd353c7ae2cb9
Merge: 0bcda81f5f6d121084131fb944e2940f614cc98c b4fa7222923bc10476b8753f358e871f461eb2db
Author: Patrick McHardy <kaber at trash.net>
Date:   Thu Jul 15 18:15:03 2010 +0200

    Merge branch 'master' into iptables-next

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                                 |    2 +-
 extensions/libipt_SET.c                      |  164 ---------
 extensions/libipt_set.c                      |  160 --------
 extensions/libipt_set.h                      |  119 ------
 extensions/libxt_SET.c                       |  286 +++++++++++++++
 extensions/{libipt_SET.man => libxt_SET.man} |    0 
 extensions/libxt_conntrack.c                 |   16 +-
 extensions/libxt_hashlimit.c                 |    6 +-
 extensions/libxt_quota.c                     |    6 +-
 extensions/libxt_quota.man                   |    3 +-
 extensions/libxt_rateest.c                   |    6 +-
 extensions/libxt_rateest.man                 |    8 +-
 extensions/libxt_set.c                       |  250 +++++++++++++
 extensions/libxt_set.h                       |  147 ++++++++
 extensions/{libipt_set.man => libxt_set.man} |    0 
 include/linux/kernel.h                       |   62 ++++
 include/linux/netfilter/x_tables.h           |   30 ++-
 include/linux/netfilter/xt_CONNMARK.h        |   22 +--
 include/linux/netfilter/xt_MARK.h            |    6 +-
 include/linux/netfilter/xt_TEE.h             |    3 +
 include/linux/netfilter/xt_connmark.h        |   11 +
 include/linux/netfilter/xt_mark.h            |    4 +
 include/linux/netfilter/xt_recent.h          |    7 +
 include/linux/netfilter/xt_set.h             |  110 ++++++
 include/linux/netfilter_ipv4/ip_set.h        |  498 --------------------------
 include/linux/netfilter_ipv4/ipt_set.h       |   21 --
 include/linux/netfilter_ipv6.h               |    1 +
 include/xtables.h.in                         |    1 -
 ip6tables-restore.c                          |    4 +-
 ip6tables.c                                  |   12 +-
 iptables-restore.c                           |    4 +-
 iptables.c                                   |   15 +-
 xtables.c                                    |   18 +-
 33 files changed, 952 insertions(+), 1050 deletions(-)
 delete mode 100644 extensions/libipt_SET.c
 delete mode 100644 extensions/libipt_set.c
 delete mode 100644 extensions/libipt_set.h
 create mode 100644 extensions/libxt_SET.c
 rename extensions/{libipt_SET.man => libxt_SET.man} (100%)
 create mode 100644 extensions/libxt_set.c
 create mode 100644 extensions/libxt_set.h
 rename extensions/{libipt_set.man => libxt_set.man} (100%)
 create mode 100644 include/linux/kernel.h
 create mode 100644 include/linux/netfilter/xt_set.h
 delete mode 100644 include/linux/netfilter_ipv4/ip_set.h
 delete mode 100644 include/linux/netfilter_ipv4/ipt_set.h


hooks/post-receive
-- 
iptables