X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ChangeLog;h=3ff486ac18850923a6599ce58bbf7515985191df;hp=65aa7df53825c98aa270573ed1e28e6711fdb063;hb=de76faf845535b90c71a30b996b411348f81f6be;hpb=f9b10a528e51af8c58fdf360302271b5ed6ff873

diff --git a/ChangeLog b/ChangeLog
index 65aa7df53..3ff486ac1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2014-10-20 lttng-tools 2.6.0-rc1 (Harry Belafonte records Banana Boat Song)
+	* Machine Interface added to lttng command line (--mi)
+	* Java Log4j agent support (--log4j)
+	* Kernel per syscall tracing
+	* Multiple fixes.
+
+2014-10-20 lttng-tools 2.5.1
+	* Fix: handle sysconf possible negative returned value
+	* Fix: channel deref. after NULL check in kernel consumer
+	* Fix: check for kernel session metadata during init
+	* Fix: incorrect cast in ust consumer assert
+	* Fix: bad handling of incoming data in consumer thread
+	* Fix: disable event for JUL domain
+	* Fix: send disable ALL command code if event is *
+	* Fix: make sure no index is in flight before using inactivity beacons
+	* Fix: Parenthesize previous statement when adding conditions to a filter
+	* Fix: parse_prob_opts return the actual success of the function
+	* Fix: Man page typos
+	* Fix: disable JUL event on destroy
+	* Fix: unbalanced ustconsumer32_data.pid_mutex lock
+
 2014-07-16 lttng-tools 2.5.0 (Take Your Poet to Work Day)
 	* Fix: validate file path creds in autoload mode
 	* Fix: change session file loading order