X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ChangeLog;h=336299feedead092e3f3a92a8c77528c44641d9f;hb=59de7e895a11828f2394f272771e692d8435516f;hp=37a26d4840c6535c980524cac525c4a3837359aa;hpb=5748584c5ae8ca5c4da26f41b6c61bb816e6d50b;p=lttng-ust.git

diff --git a/ChangeLog b/ChangeLog
index 37a26d48..336299fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-29 lttng-ust 2.6.1
+	* Fix: use lttng_secure_getenv to handle env. vars. involving paths
+	* Fix: add missing getenv wrapper
+	* Fix: Don't wait during registration if clock_gettime() fails
+	* Fix: Mismatching code and console output in log4j example
+
 2015-01-26 lttng-ust 2.6.0
 	* Fix: java-agent: out-of-tree path to java manifest
 	* Fix: missing parenthesis in offset_align_floor