]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #569 in SNORT/snort3 from linez to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 28 Jul 2016 16:37:13 +0000 (12:37 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 28 Jul 2016 16:37:13 +0000 (12:37 -0400)
commit85c92d3f88115b0cf897d41f16d8f4449dd9429c
tree1c47381fd730a7a6f0a12ed10b4a33481ceb9904
parent6f0c2cfa7ffe97b0c4a9c21a10612e252947de95
Merge pull request #569 in SNORT/snort3 from linez to master

Squashed commit of the following:

commit b15f074d2d03ba332b386eb7571a9bf2afdb4dfe
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Jul 28 12:08:37 2016 -0400

    refactor, comments

commit e877c882772db117208bd60286db5b4a4feb6eb9
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Jul 22 14:33:03 2016 -0400

    fix line number in rule parsing errors
    no line numbers for lua messages
doc/bugs.txt
src/log/messages.cc
src/parser/parse_conf.cc
src/parser/parser.cc
src/parser/parser.h