[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta4-420-gc80990f

[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  c80990fe1046876753cd7536db32236a77173f23 (commit)
       via  ad5a753dde70ac0db2a3cfa9f0b549b5798e3aa8 (commit)
       via  c1bf0e1b079e4c63e9dda6d5c66527cff0eec721 (commit)
       via  b03c288d9a3776aee4e20667f5b7757b18fedea6 (commit)
      from  a4089873c70b621a84ca4be75d3a669de7ff45cc (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 c80990fe1046876753cd7536db32236a77173f23
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Nov 2 09:54:46 2015 +0100

    output: cleanup JSON logging

commit ad5a753dde70ac0db2a3cfa9f0b549b5798e3aa8
Author: Victor Julien <victor at inliniac.net>
Date:   Sun Nov 1 23:43:59 2015 +0100

    output-json: don't alloc for JSON to string

commit c1bf0e1b079e4c63e9dda6d5c66527cff0eec721
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Nov 3 10:58:36 2015 +0100

    rule profiling: json output

commit b03c288d9a3776aee4e20667f5b7757b18fedea6
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Nov 2 23:00:42 2015 +0100

    profiling: cleanup, remove MIN declaration

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

Summary of changes:
 src/output-json.c          |  24 ++++--
 src/util-error.c           |   1 +
 src/util-error.h           |   1 +
 src/util-logopenfile.c     |  13 +--
 src/util-logopenfile.h     |   2 +-
 src/util-profiling-rules.c | 200 ++++++++++++++++++++++++++++++++-------------
 suricata.yaml.in           |   5 +-
 7 files changed, 175 insertions(+), 71 deletions(-)


hooks/post-receive
-- 
OISF