[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-1.4beta1-66-g82fc617

[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  82fc61770bd3cdeb5cf033bfa8f7dc2580ebffbc (commit)
       via  a0c43a8a1c872fa1d85360f750d0235705a6911b (commit)
      from  b6f573d9cb1366c3e505347780569101539f77ce (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 82fc61770bd3cdeb5cf033bfa8f7dc2580ebffbc
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Sep 26 08:58:05 2012 +0200

    threshold: allow threshold.config to override rule
    
    Allow threshold.conf to override rule thresholds in the following
    cases:
    
    - threshold.config rule uses threshold or event_filter AND
    - threshold.config rule applies to a single signature (so no
      gid 0 or sid 0)
    
    Confirmed to work with both threshold and detection_filter rule
    keywords.
    
    Part of bug #425.

commit a0c43a8a1c872fa1d85360f750d0235705a6911b
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Sep 26 07:17:54 2012 +0200

    Minor parsing cleanups in detect-engine options.

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

Summary of changes:
 src/detect-engine.c         |   10 +++++-----
 src/util-threshold-config.c |   32 ++++++++++++++++++++++++--------
 2 files changed, 29 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
OISF