From 65d1783b45bc12be709464cb4b88a2cfa4fa168f Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Fri, 20 Jan 2012 16:12:58 +0100
Subject: [PATCH] Update Changelog to reflect changes between 1.2 and 1.2.1

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

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)
-- 
2.47.2