From: Victor Julien <victor@inliniac.net>
Date: Fri, 20 Jan 2012 15:12:58 +0000 (+0100)
Subject: Update Changelog to reflect changes between 1.2 and 1.2.1
X-Git-Tag: suricata-1.2.1^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fremotes%2Forigin%2Fmaster-1.2.x;p=thirdparty%2Fsuricata.git

Update Changelog to reflect changes between 1.2 and 1.2.1
---

diff --git a/ChangeLog b/ChangeLog
index b594dd5965..789ffa7f40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1.2.1 -- 2012-01-20
+
+- fix malformed unified2 records when writing alerts trigger by stream inspection (#402)
+- only force a pseudo packet inspection cycle for TCP streams in a state >= established
+
 1.2 -- 2012-01-19
 
 - improved Windows/CYGWIN path handling (#387)