X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ChangeLog;h=8d8da4a5fe45bb219417dbdb377e389ee3196cea;hb=refs%2Ftags%2Fv2.6.0-rc2;hp=b6d40363c5e9d3192fb9176c827ffd7af48d6af6;hpb=409cc2ea5eaa0b05f85c8d963cb602bacdd938e9;p=lttng-ust.git

diff --git a/ChangeLog b/ChangeLog
index b6d40363..8d8da4a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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