Update Changelog for 2.1beta1

diff --git a/ChangeLog b/ChangeLog
index 418149aace4d644cca2b2821c67cf0a1c4753172..8e3cb6766f34df02faf78d8de87a8f6b1e5e645f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2.1beta1 -- 2014-08-12
+
+Feature #1155: Log packet payloads in eve alerts
+Feature #1208: JSON Output Enhancement - Include Payload(s)
+Feature #1248: flow/connection logging
+Feature #1258: json: include HTTP info with Alert output
+Optimization #1039: Packetpool should be a stack
+Optimization #1241: pcap recording: record per thread
+
 2.0.3 -- 2014-08-08
 
 Bug #1236: fix potential crash in http parsing