[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0beta1-423-ge9a4871

[noreply at openinfosecfoundation.org]

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  e9a4871077cfcdcc0da095da0c2843f63578ad16 (commit)
       via  ae9393987e4ea6ea89f1d0d765971011d8e5b30d (commit)
       via  0a24ac085577fc2dd1c7f1161614a705603368e4 (commit)
       via  8d29dfca5972dfdaa102fb4b8a8dc39f5b80217a (commit)
       via  5f6705c4dc2cdd20451513b01e049f1565ea566f (commit)
       via  b033acfb0cba7c0356572a09fcfcb01b62fe33fd (commit)
       via  c981a16579bd4cf220cc6ef5f59c9062034ed569 (commit)
       via  b8e13d4bd6d6cdbd6a5e8e9f27e7f4c15ea32da6 (commit)
       via  0820ac9355fd51a6023a904a9ed075e12a32ee5d (commit)
      from  6cd6caf3ea5bb2eea04df8354f386cb203b95196 (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 e9a4871077cfcdcc0da095da0c2843f63578ad16
Author: Jason Ish <jason.ish at emulex.com>
Date:   Tue Dec 3 16:22:51 2013 -0600

    Fix alignment in usage.

commit ae9393987e4ea6ea89f1d0d765971011d8e5b30d
Author: Giuseppe Longo <giuseppelng at gmail.com>
Date:   Sun Dec 1 17:46:31 2013 +0100

    Adds a defrag configuration example in suricata.yaml

commit 0a24ac085577fc2dd1c7f1161614a705603368e4
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Dec 4 11:47:54 2013 +0100

    Fix Conf api usage after rebase

commit 8d29dfca5972dfdaa102fb4b8a8dc39f5b80217a
Author: Jason Ish <jason.ish at emulex.com>
Date:   Thu Nov 28 10:04:16 2013 -0600

    Instead of exiting on memory failure, log a warning then return NULL
    to signify an error to the caller.

commit 5f6705c4dc2cdd20451513b01e049f1565ea566f
Author: Jason Ish <jason.ish at emulex.com>
Date:   Thu Nov 28 09:46:14 2013 -0600

    Better document ConfSet and ConfSetFinal.

commit b033acfb0cba7c0356572a09fcfcb01b62fe33fd
Author: Jason Ish <jason.ish at emulex.com>
Date:   Thu Nov 21 14:52:06 2013 -0600

    Subsequent configuration keys now override previous ones
    instead of merging.
    
    The exception is final values, for example, values like
    default-log-dir that may be set on the command line.

commit c981a16579bd4cf220cc6ef5f59c9062034ed569
Author: Jason Ish <jason.ish at emulex.com>
Date:   Thu Nov 21 13:55:03 2013 -0600

    Function to prune all non-final nodes from a configuration node.

commit b8e13d4bd6d6cdbd6a5e8e9f27e7f4c15ea32da6
Author: Jason Ish <jason.ish at emulex.com>
Date:   Thu Nov 21 13:36:45 2013 -0600

    More concise API for setting config values that
    can be overrided or not (final values).

commit 0820ac9355fd51a6023a904a9ed075e12a32ee5d
Author: Jason Ish <jason.ish at emulex.com>
Date:   Thu Nov 21 09:20:10 2013 -0600

    Cleanup ConfSet, ConfGet, make more concise.
    
    Removes ifdef's for readability by using strchr instead
    of strtok.

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

Summary of changes:
 src/conf-yaml-loader.c    |   97 ++++++++++-
 src/conf.c                |  440 ++++++++++++++++++++++++++++++++-------------
 src/conf.h                |    9 +-
 src/defrag-config.c       |   23 ---
 src/defrag.c              |    2 +-
 src/runmode-unix-socket.c |    4 +-
 src/suricata.c            |   42 +++---
 src/util-conf.c           |    2 +-
 suricata.yaml.in          |   14 ++
 9 files changed, 453 insertions(+), 180 deletions(-)


hooks/post-receive
-- 
OISF