[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta4-261-g63a4796

[OISF Git]

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 "OISF".

The branch, master has been updated
       via  63a47967d70c39179cf7cad67ffc1eb0c912adb2 (commit)
       via  c31660e5fdc3e78cace3c7e4aa02cc1f4c24deae (commit)
       via  a7a902a071b91430268a43cdb8eedb3e914ffecb (commit)
       via  cbf46c44ecec4e59375abdc5b409200b49d47ab9 (commit)
      from  834c36659e881aa9b140683151309e4229600b09 (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 63a47967d70c39179cf7cad67ffc1eb0c912adb2
Author: Antti Tönkyrä <antti.tonkyra at f-solutions.fi>
Date:   Sat Aug 15 20:58:56 2015 +0000

    source-pfring: don't set cluster mode when using ZC and VLAN tracking is disabled

commit c31660e5fdc3e78cace3c7e4aa02cc1f4c24deae
Author: gureedo <gureedo at intersvyaz.net>
Date:   Tue Jul 28 09:40:13 2015 +0500

    netmap: enable zero-copy mode only when copy-mode is specified.
    Perform zero-copy checks only when copy-mode is specified.

commit a7a902a071b91430268a43cdb8eedb3e914ffecb
Author: gureedo <gureedo at intersvyaz.net>
Date:   Tue Jul 28 09:35:53 2015 +0500

    netmap: extended comments for options in configuration file.
    Added extended description of the use of OS endpoint with copy mode.

commit cbf46c44ecec4e59375abdc5b409200b49d47ab9
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Aug 20 19:31:23 2015 +0200

    transaction inspection: fix limit enforcement
    
    Make sure we're never wrapping around the size value.

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

Summary of changes:
 src/detect-engine-hcbd.c | 2 +-
 src/detect-engine-hhd.c  | 2 +-
 src/detect-engine-hsbd.c | 2 +-
 src/source-netmap.c      | 5 +++--
 src/source-pfring.c      | 6 ++++--
 suricata.yaml.in         | 6 ++++++
 6 files changed, 16 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
OISF