]> git.ipfire.org Git - thirdparty/snort3.git/commit
projects / thirdparty / snort3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a02b2d3) | patch
Merge pull request #1273 in SNORT/snort3 from snort2lua_missing to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 19 Jun 2018 20:31:13 +0000 (16:31 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 19 Jun 2018 20:31:13 +0000 (16:31 -0400)
commit502ea87c5fcb174f388c45cf0439cce1c9df1d97
tree6fb4ec9bd1f379cf35ceb484849b8d9bc359e794tree
parenta02b2d38e6050f7f9e73cfbb755fb78dd3506f15commit | diff
Merge pull request #1273 in SNORT/snort3 from snort2lua_missing to master

Squashed commit of the following:

commit 2e9ad79321cb410c9f5a04009aa7b678943086c8
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Jun 14 13:01:06 2018 -0400

    snort2lua: added missing keyword to nap parsing
tools/snort2lua/preprocessor_states/pps_nap_selector.cc diff | blob | blame | history
Mirror of https://github.com/snort3/snort3.git