X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ChangeLog;fp=ChangeLog;h=af8d9c833660876ec018252570d18122d2459795;hp=f23e19ce81e675ff2674827e730969202e13878d;hb=8991668e5aee318628b29aa36904855461dad07a;hpb=f17896506217837e40b6b8aa3c64594c9370d34b

diff --git a/ChangeLog b/ChangeLog
index f23e19ce8..af8d9c833 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2013-06-25 lttng-tools 2.2.0 (National Catfish Day)
+	* STABLE VERSION
+	* Fix: if relayd is unreachable, disable consumer for the session
+	* Fix: possible infinite loop in disable ust event
+	* Fix: don't enable a channel if a session was already started
+	* Fix: bad type for the relayd id
+	* Fix: add debug statement in kernel flush metadata
+	* Fix: destroy default created channel if add-context fails
+	* Fix: clarify tracefile size/count in lttng.1 man
+	* Fix: don't stop a session that was not previously started
+	* Fix: update lttng.1 man page
+	* Fix: bad protocol flow between sessiond and consumerd
+	* Fix: kernel memory leak in error path
+
 2013-06-20 lttng-tools 2.2.0-rc3
 	* Multiple memory and fd leak fixes in sessiond and consumerd
 	* Test: stress test added to the repository but not in make check