Update version to v2.5.0-rc2

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/ChangeLog b/ChangeLog
index aa462a2874087381c237f5a9ef3725e273c05177..3f698df473c8daf7d8f74c5ee0de28816f0957b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2014-06-27 lttng-tools 2.5.0-rc2
+       * Test: add JUL disable event tests
+       * Fix: disable JUL event on UST side
+       * Fix: accept override flag even without a load path
+       * Fix: bad error code path when loading session
+       * Fix: set session in output mode if URL are set afterwards
+       * Fix: add a kernel context list to the channel
+       * Fix: Add vpid, vppid and vtid info in add-context help
+       * Fix: wrong behavior of save command when no session name is provided
+       * Fix: missing context type string in save for ust context
+       * Fix: wrong casting of return value
+       * Fix: add dependency to libcommon for python binding
+       * Fix: remove the default GIT_VERSION
+
 2014-05-28 lttng-tools 2.5.0-rc1 (International Hamburger Day)
        * Save/load session feature
        * Daemon configuration file support

diff --git a/configure.ac b/configure.ac
index 34ec26d0968f1449118649311bda4ffecff80670..a6f5b0be9d022e45db308ab7072216a1467372a2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools],[2.5.0-rc1],[dgoulet@efficios.com],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.5.0-rc2],[dgoulet@efficios.com],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST