Version 2.6.0-rc2

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/ChangeLog b/ChangeLog
index b6d40363c5e9d3192fb9176c827ffd7af48d6af6..8d8da4a5fe45bb219417dbdb377e389ee3196cea 100644 (file)
--- 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

diff --git a/configure.ac b/configure.ac
index 9a81d2b38d85a6715053faf9cf0a27509ee3409c..86c54757f63e3a4a4fcdee22484376ce1e1b1b74 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[2.6.0-rc1],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.6.0-rc2],[mathieu dot desnoyers at efficios dot com])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html