]> git.ipfire.org Git - thirdparty/snort3.git/commit
projects / thirdparty / snort3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 597cb67) | patch
Merge pull request #1279 in SNORT/snort3 from snort2lua_nap_merge to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Wed, 20 Jun 2018 20:26:09 +0000 (16:26 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Wed, 20 Jun 2018 20:26:09 +0000 (16:26 -0400)
commitbe9767c8cb2acc7c94bbbb8aee585d43e1e82057
tree1ee26f9eeebed50345a2dc87b867b721163228actree
parent597cb676461304b87d9a61417bcaa68535a81ccecommit | diff
Merge pull request #1279 in SNORT/snort3 from snort2lua_nap_merge to master

Squashed commit of the following:

commit 116a11685c1ba81921f808abf0a6af8fe5e4a48b
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Jun 13 16:39:17 2018 -0400

    snort2lua: merge multiple nap rules with the same id
tools/snort2lua/preprocessor_states/pps_nap_selector.cc diff | blob | blame | history
Mirror of https://github.com/snort3/snort3.git