From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 20 Oct 2014 20:59:51 +0000 (-0400)
Subject: Version 2.5.1
X-Git-Tag: v2.5.1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=0182aa63b952a38237bf000eb3ef77faef78601f;p=lttng-ust.git

Version 2.5.1

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

diff --git a/ChangeLog b/ChangeLog
index dd9d4cac..96e516c2 100644
--- 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 175a0a65..6457a30f 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.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