Version 2.5.0-rc2

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

diff --git a/ChangeLog b/ChangeLog
index fba4088f3fdc37a2ddee896b5d6c160a13e12345..808e7edc3394e3e79a11379a00ca45185b2d4db7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-27 lttng-ust 2.5.0-rc2
+       * Fix: lttng-ust-jul: set thread in daemon mode
+       * JUL: use root logger to capture events
+       * Fix: Wrong configure check for UST perf event counters context support
+       * Fix: multiple providers in same C file failure
+       * Fix: header inclusion guard typo in lttng-ust-tracef-provider.h
+       * Fix: 2.5.0-rc1 changelog has off-by-one date
+
 2014-05-28 (International Hamburger Day) lttng-ust 2.5.0-rc1
        * Fix: out of tree build for lib Java and JUL
        * Fix: default loglevel is DEBUG

diff --git a/configure.ac b/configure.ac
index 4841f46fa0c62c1da1adf75bea15c7e2ae69afdd..5d17cc3a4ea3b0f96c2ba4c71e9ded9f4b43de41 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-rc1],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.5.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