X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ChangeLog;h=37a26d4840c6535c980524cac525c4a3837359aa;hb=ab7ffb47327c43dff0b56d5763f0c6ce2d68f919;hp=b6d40363c5e9d3192fb9176c827ffd7af48d6af6;hpb=837fc26612e925858292a31a7992e66b93d09f17;p=lttng-ust.git

diff --git a/ChangeLog b/ChangeLog
index b6d40363..37a26d48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+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
+	* Fix: add ustctl_has_perf_counters
+	* Fix: add urcu-bp TLS fixup
+	* Fix: add missing poll.h include
+	* Fix: get_subbuf: bound number of consumerd retry
+
+2014-12-12 lttng-ust 2.6.0-rc3
+	* Fix: man: you can't link a lib with a static lib
+	* Fix: context alignment not properly handled
+	* Fix: Shorthand option -cp not supported in all version of Java
+	* Fix: allow tracepoints to build with --std=c99
+	* Fix: filter attach vs event enable race
+	* Fix: add a configure check for weak symbols support
+	* Fix coverity warning about sizeof(void **) != sizeof(void *)
+	* Fix: off-by-one in sequence filter comparator
+	* Fix: Java Agent JAR file symlink should be created after objects install
+
+2014-11-04 lttng-ust 2.6.0-rc2
+	* Fix: Add versioning to liblttng-ust-agent JAR
+	* Fix: Warn when log4j version is too old
+	* Update Java agent documentation
+	* Fix: Try loading classes using the thread context class loader
+	* Update version name
+
 2014-10-20 lttng-ust 2.6.0-rc1
 	* Add missing file to gitignore
 	* Fix: preserve example files' timestamps when copying