git.ipfire.org Git - thirdparty/snort3.git/commit

author	Mike Stepanek (mstepane) <mstepane@cisco.com>
	Tue, 26 Jun 2018 14:41:01 +0000 (10:41 -0400)
committer	Mike Stepanek (mstepane) <mstepane@cisco.com>
	Tue, 26 Jun 2018 14:41:01 +0000 (10:41 -0400)
commit	8d9d8bf23b31d685ccee3c9b061bf7f8d2bdf74f
tree	551cfa89a37b0d5ae2170573cf88ef824bebcdf4	tree
parent	edecf733edfb774c289d9d69a506a4477ab34a0a	commit \| diff

Merge pull request #1290 in SNORT/snort3 from lua_dev_notes to master

Squashed commit of the following:

commit 295f9e3f3471f0c92b655cc66ccb8023feec1ad9
Author: deramada <deramada@cisco.com>
Date:   Tue Jun 26 08:54:58 2018 -0400

    bad grammer

commit cc6f41f602fe450be66d1e62678e4ba156f59051
Author: deramada <deramada@cisco.com>
Date:   Tue Jun 26 08:42:11 2018 -0400

    fixup! appid: dev notes on lua detectors

commit c1d71ec9ed4d5f4ad9ae24495893ac7d44a34071
Author: deramada <deramada@cisco.com>
Date:   Mon Jun 25 17:01:34 2018 -0400

    appid: dev notes on lua detectors