From: Russ Combs <rucombs@cisco.com>
Date: Tue, 13 Jan 2015 14:28:27 +0000 (-0500)
Subject: update change log
X-Git-Tag: 3.0.0-233~1087^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46ffec239267eef5056795ce7d111997eb0f6112;p=thirdparty%2Fsnort3.git

update change log
---

diff --git a/ChangeLog b/ChangeLog
index ad1c1ad11..e6be48e88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+-- add generalized infractions tracking to new_http_inspect
+-- updated snort2lua to override default tables (x = { t = v }; x.t.a = 1)
 -- additional codec refactoring
 -- added pflog codecs
 -- fixed stream_size rule option