Update version to v2.6.0

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/ChangeLog b/ChangeLog
index d94ec429a692bb1cb9b8302a2e7785c400d23816..8830c9c342242e65b5890bd74a69487ceffe4269 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2015-01-26 lttng-tools 2.6.0 (Paul the Octopus is born)
+       * Tests: Run health check test_thread_ok as part of root_regression
+       * Fix: deadlock between UST registry lock and consumer lock
+       * Fix: uninitialized return value
+       * Fix: build failure using disable-lttng-ust configure option
+       * Fix: grab more than one packet for snapshots
+       * Fix: per-uid flush and ust registry locking
+       * Fix: add missing synchronization point for before app test case
+       * Fix: tests: wait output hide Terminate errors
+       * Fix: tests: remove killall, add missing SIGTERM handlers
+       * Fix: high throughput test: reset bw limit on sigterm
+       * Fix: tests: add missing wait, document missing synchro
+       * Document test anti-patterns
+       * Fix: test flaky sleep and wait patterns
+       * Fix: tests: don't use pidof to wait for test apps
+       * Docs: Grammar fixes in the lttng manpage
+       * Fix: add missing UST perf counter support check
+       * Fix: tests: integer too large for long type
+       * Fix: undefined operation on last_relay_viewer_session_id
+       * Fix: print format type mismatch
+       * Fix: print format type mismatch
+       * Fix: Remove unused argument in debug statement
+       * Cleanup: Remove unused label
+       * Fix: exit threads not only on goto restart
+       * Fix: poll: show the correct number of fds
+       * Fix: compat poll: add missing empty revents checks
+       * Fix: various compat poll/epoll issues
+       * Fix: mi: snapshot: missing error handling for session name
+       * Fix: ust-app: per-PID app unregister vs tracing stop races
+       * Fix: data pending: allow empty streams
+       * Fix: ust snapshot: cleanup after error
+       * Fix: add missing RCU read unlock
+
 2014-12-12 lttng-tools 2.6.0-rc4 (International Day Of Heavy Metal)
        * Fix: don't destroy the sockets if the snapshot was successful
        * Fix: Missing RCU read locks in syscall_list_channel()

diff --git a/configure.ac b/configure.ac
index 60ee87732a5a050d54a8d1df812780813f05ed48..d276c217a5179a228b98919f4f2e055f87b7a326 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools],[2.6.0-rc4],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
+AC_INIT([lttng-tools],[2.6.0],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST