Version 2.5.4

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

diff --git a/ChangeLog b/ChangeLog
index c9708738942e69fb7a1c6ed375b5614974d7e570..75daacaf1778c3fdbcee92735c545b2e35c2f951 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-29 lttng-ust 2.5.4
+       * 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
+
 2015-01-26 lttng-ust 2.5.3
        * Fix: missing parenthesis in offset_align_floor
        * Fix: add urcu-bp TLS fixup

diff --git a/configure.ac b/configure.ac
index 8729c0356b6526406ef26bf0cf4b554cae6c7055..bfe77c3ebd8285b88ea150742123eff59c7defdd 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.3],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.5.4],[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