Version 2.6.1

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

diff --git a/ChangeLog b/ChangeLog
index 37a26d4840c6535c980524cac525c4a3837359aa..336299feedead092e3f3a92a8c77528c44641d9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-29 lttng-ust 2.6.1
+       * Fix: use lttng_secure_getenv to handle env. vars. involving paths
+       * Fix: add missing getenv wrapper
+       * Fix: Don't wait during registration if clock_gettime() fails
+       * Fix: Mismatching code and console output in log4j example
+
 2015-01-26 lttng-ust 2.6.0
        * Fix: java-agent: out-of-tree path to java manifest
        * Fix: missing parenthesis in offset_align_floor

diff --git a/configure.ac b/configure.ac
index 8c843aa9776c9fb9e10795c9ba296f3501fc3108..52e626b269a1d4691c02d123beaf27229199e3e5 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],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.6.1],[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