Version 2.6.0

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

diff --git a/ChangeLog b/ChangeLog
index d08576b3a61edb5db913f5f04dcbf19544221453..37a26d4840c6535c980524cac525c4a3837359aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-26 lttng-ust 2.6.0
+       * Fix: java-agent: out-of-tree path to java manifest
+       * Fix: missing parenthesis in offset_align_floor
+       * Fix: add ustctl_has_perf_counters
+       * Fix: add urcu-bp TLS fixup
+       * Fix: add missing poll.h include
+       * Fix: get_subbuf: bound number of consumerd retry
+
 2014-12-12 lttng-ust 2.6.0-rc3
        * Fix: man: you can't link a lib with a static lib
        * Fix: context alignment not properly handled

diff --git a/configure.ac b/configure.ac
index 2255c7b494b5c2142822e962b7a5a56c86fa5326..8c843aa9776c9fb9e10795c9ba296f3501fc3108 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.6.0-rc3],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.6.0],[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