From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 29 Apr 2015 15:18:34 +0000 (-0400)
Subject: Version 2.6.1
X-Git-Tag: v2.6.1^0
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=369ee1a1b12338e5158d24f9c879f5dd52f1aba2;p=lttng-ust.git

Version 2.6.1

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

diff --git a/ChangeLog b/ChangeLog
index 37a26d48..336299fe 100644
--- 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 8c843aa9..52e626b2 100644
--- 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