Update changelog for 1.3 release.

diff --git a/ChangeLog b/ChangeLog
index e3669106dc3772dafc68c084ee8bd5f7fc596bc3..a78775f8ba62c18e2dce48be701df151dac22bdd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1.3 -- 2012-07-06
+
+- make live rule reloads optional and disabled by default
+- fix a shutdown bug
+- fix several memory leaks (#492)
+- warn user if global and rule thresholding conflict (#455)
+- set thread names on FreeBSD (Nikolay Denev)
+- Fix PF_RING building on Ubuntu 12.04
+- rule analyzer updates
+- file inspection improvements when dealing with limits (#493)
+
 1.3rc1 -- 2012-06-29
 
 - experimental live rule reload by sending a USR2 signal (#279)