[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0beta2-268-gf791d0f

[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  f791d0f5c5640eb1a593f86bb6b864be9b973896 (commit)
       via  c95df281e39e4c946ac22001b22aee83e919a534 (commit)
       via  33e4cc065f31706b481441fcd1b28526a3374f7b (commit)
      from  18edec876917852e66df54836a9ebbdbe684551b (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 f791d0f5c5640eb1a593f86bb6b864be9b973896
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Feb 11 09:44:26 2014 +0100

    vlan/QinQ: add vlan_qinq counter
    
    This patch introduces a new counter "decoder.vlan_qinq". It counts
    packets that have more than two stacked vlan layers.
    
    Packets with 2 vlan layers will both increment "decoder.vlan" and
    "decoder.vlan_qinq".

commit c95df281e39e4c946ac22001b22aee83e919a534
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Feb 11 07:44:42 2014 +0100

    eve-log: add warning if enabled but not supported
    
    If we're not compiled against libjansson, the eve-log output is not
    available. This patch adds a warning.

commit 33e4cc065f31706b481441fcd1b28526a3374f7b
Author: Jason Ish <jason.ish at emulex.com>
Date:   Mon Feb 10 14:47:43 2014 -0600

    Promote nodes set with --set to sequence nodes as needed.
    
    A node isn't known to be a sequence node until the YAML is parsed.
    If a node sequence node was set on the command line, promote
    it to a sequence node when it is discovered by YAML to be
    a sequence node.
    
    Fixes comment #18 in issue 921.

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

Summary of changes:
 src/conf-yaml-loader.c |    2 +-
 src/decode-vlan.c      |    5 ++++-
 src/decode.c           |    2 ++
 src/decode.h           |    1 +
 src/runmodes.c         |   12 ++++++++++--
 5 files changed, 18 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
OISF