[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta1-87-g4816dcc

[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  4816dcc3d312202af2f7048e2b19b4b1ba24d22f (commit)
       via  bd1a193877cf72af7bbcf795d453fd1f1036f1ca (commit)
       via  79f0da1df1b53a5a66c97c7b231d843e693ef086 (commit)
       via  936db9c02a61ce0c724a780ea793b294195a6ee9 (commit)
       via  4443da59b45adea2e0e27995c1f8a5c8284a30a1 (commit)
       via  47cd4974477f911432b654c0b93f60de466cba5b (commit)
      from  04afcf2717d1d6814a8ac39b5489ef3ce8ff2f0d (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 4816dcc3d312202af2f7048e2b19b4b1ba24d22f
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Oct 1 09:09:15 2014 +0200

    flow json log: add 'shutdown' as flow end reason
    
    When engine shuts down all flows in the hash are logged out. They
    may not have timed out yet. So they are forced. Log the reason to
    be 'shutdown'.

commit bd1a193877cf72af7bbcf795d453fd1f1036f1ca
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Sep 30 15:24:24 2014 +0200

    flow: fix flow logging at shutdown
    
    Move all flows from the hash to the recycler at shutdown.
    
    Bug #1260

commit 79f0da1df1b53a5a66c97c7b231d843e693ef086
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Sep 30 13:37:30 2014 +0200

    output-lua: set proper callbacks for HTTP
    
    Enable the relevant HTTP callbacks.
    
    Bug #1287

commit 936db9c02a61ce0c724a780ea793b294195a6ee9
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Sep 30 13:27:52 2014 +0200

    output-lua: add config to yaml
    
    Disabled by default.

commit 4443da59b45adea2e0e27995c1f8a5c8284a30a1
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Sep 30 13:19:09 2014 +0200

    output-lua: add script-dir config param
    
    Add 'scripts-dir' config directive that is prepended to the script
    names to form a path. If ommited or empty, script are opened from
    the CWD.

commit 47cd4974477f911432b654c0b93f60de466cba5b
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Sep 30 11:12:47 2014 +0200

    yaml: add eve flow and netflow entries
    
    Added, commented out by default.
    
    Bug #1257.

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

Summary of changes:
 src/flow-manager.c     |   84 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/flow.h             |    1 +
 src/output-json-flow.c |    2 ++
 src/output-lua.c       |   53 +++++++++++++++++++++++++++---
 suricata.yaml.in       |   14 ++++++++
 5 files changed, 150 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
OISF