Update version to v2.5.0

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

diff --git a/ChangeLog b/ChangeLog
index 3f698df473c8daf7d8f74c5ee0de28816f0957b4..c43fc7c4f306255e8a2a00a02227f86845f42dd4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2014-07-16 lttng-tools 2.5.0 (Take Your Poet to Work Day)
+       * Fix: validate file path creds in autoload mode
+       * Fix: change session file loading order
+       * Fix: add Loading Sessions section to lttng-sessiond.8
+       * Fix: add default session conf. dir to manpage
+       * Fix: on session load, add it to the .lttngrc
+       * Fix: clarify session conf. directory in man
+       * Fix: filter error path could free invalid ptr
+       * Fix: Create a lock file to prevent multiple session daemons
+       * Fix: relayd stream set close_flag on stream close
+       * Fix: ustctl_get_stream_id without UST support
+       * Fix: avoid freeing invalid ptr in filter bytecode
+       * Fix: get the stream_id when generating live beacons
+       * Fix: use biggest subbuffer size for snapshot max-size
+       * Fix: Possible memory leak when multiple config files are loaded
+       * Fix: Clamp verbosity value read from config file
+       * Fix: Unchecked strdup return values in set_option
+
 2014-06-27 lttng-tools 2.5.0-rc2
        * Test: add JUL disable event tests
        * Fix: disable JUL event on UST side

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