Version 2.5.1

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

diff --git a/ChangeLog b/ChangeLog
index dd9d4cac33d68f10bf4a237a7263a3effbdaa7e9..96e516c295fe14c8d15f81c21d2974ee696003d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 lttng-ust 2.5.1
+       * Fix: preserve example files' timestamps when copying
+       * configure.ac: fix "missing jni.h" error message
+
 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 175a0a65117039e05f1681940dc50db0bf4009f2..6457a30ffbc0f56264f3a88ef89a8aab457a04f1 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.5.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