Version 2.6.0-rc1

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

diff --git a/ChangeLog b/ChangeLog
index dd9d4cac33d68f10bf4a237a7263a3effbdaa7e9..b6d40363c5e9d3192fb9176c827ffd7af48d6af6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+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"

diff --git a/configure.ac b/configure.ac
index 82db75bd1a6126902fc4b5225bc79ce5ccac0b10..4143a4e486036582271a0306316d67212027148f 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.5.0],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.6.0-rc1],[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