[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta4-129-g80615f7

[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  80615f7d43f500b6ca64324dcfd0b43cecea164f (commit)
       via  813930f0271ef2e8716fef9eab01dd616301bc8a (commit)
       via  14466a803dc1782bea978f3f428465ad08e64d5d (commit)
       via  e3ce29f694217ee5880db609cd49228166d1c8fa (commit)
       via  3e14aa729ae83616e4724ff626a346bd75713ee8 (commit)
      from  b7f1e9e370230023b55dd1d082513683db87647f (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 80615f7d43f500b6ca64324dcfd0b43cecea164f
Author: Victor Julien <victor at inliniac.net>
Date:   Thu May 28 20:44:36 2015 +0200

    ips: move counters in common struct and funcs

commit 813930f0271ef2e8716fef9eab01dd616301bc8a
Author: Victor Julien <victor at inliniac.net>
Date:   Wed May 27 17:53:23 2015 +0200

    nfq: add ips stats

commit 14466a803dc1782bea978f3f428465ad08e64d5d
Author: Victor Julien <victor at inliniac.net>
Date:   Wed May 27 17:17:50 2015 +0200

    decode: create util function for basic counter updates

commit e3ce29f694217ee5880db609cd49228166d1c8fa
Author: Jason Ish <ish at unx.ca>
Date:   Wed Jun 10 16:09:58 2015 -0600

    json-stats: log deltas
    
    If "deltas" is yes, log delta values as the name of the value
    suffixed with _delta.

commit 3e14aa729ae83616e4724ff626a346bd75713ee8
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Jun 17 14:36:54 2015 +0200

    detect-state: remove/hide BUG_ON statements

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

Summary of changes:
 src/decode.c              | 31 +++++++++++++++++++++++++++++++
 src/decode.h              | 14 ++++++++++++++
 src/detect-engine-state.c |  9 ++++++---
 src/output-json-stats.c   | 32 +++++++++++++++++++++++++++++---
 src/source-af-packet.c    |  6 +-----
 src/source-erf-dag.c      |  6 +-----
 src/source-erf-file.c     |  6 +-----
 src/source-ipfw.c         |  5 +----
 src/source-mpipe.c        |  8 +-------
 src/source-napatech.c     |  6 +-----
 src/source-netmap.c       |  5 +----
 src/source-nflog.c        |  5 +----
 src/source-nfq.c          | 15 ++++++++++-----
 src/source-pcap-file.c    |  6 +-----
 src/source-pcap.c         |  6 +-----
 src/source-pfring.c       |  6 +-----
 suricata.yaml.in          |  1 +
 17 files changed, 102 insertions(+), 65 deletions(-)


hooks/post-receive
-- 
OISF