X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ChangeLog;h=8d8da4a5fe45bb219417dbdb377e389ee3196cea;hb=d7fee4ee5a00c721bcce51055e28777b8a95d863;hp=dd9d4cac33d68f10bf4a237a7263a3effbdaa7e9;hpb=ce59a997afdb7dc8af02b464430bb7e35549fa66;p=lttng-ust.git

diff --git a/ChangeLog b/ChangeLog
index dd9d4cac..8d8da4a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+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
+	* Fix: Abort loading log4j agent classes when detected log4j version is too old
+	* Cleanup: Remove the no longer needed liblttng-ust-jul folder
+	* Fix: Wrong CLASSPATH when building liblttng-ust-java oot
+	* Fix: Wrong CLASSPATH when building liblttng-ust-java-agent oot
+	* Rename public structure to avoid collisions
+	* Refactor liblttng-ust-jul in liblttng-ust-agent
+	* Build the liblttng-ust-java library using the new M4 macros
+	* Add M4 macros helpers to build Java programs
+	* Modernize README using Markdown
+	* Documentation: clarify event name in lttng-ust.3
+	* Add cscope to gitignore
+	* configure.ac: fix "missing jni.h" error message
+	* Fix: remove references to trace_printf()
+	* Change JUL agent to use the new ABI
+
 2014-07-16 (Take Your Poet to Work Day) lttng-ust 2.5.0
 	* Mutex while updating statedump_pending is not needed
 	* Revert "Turn base address dump into experimental feature"