Version 2.6.0

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

diff --git a/ChangeLog b/ChangeLog
index 51fbf15c58df03d7ec6c971b09df8aac3b746fcf..ff77e50dc5a9ab751fe5d0d1906cb74112ed8be0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2015-01-26 LTTng modules 2.6.0
+       * Fix: missing parenthesis in offset_align_floor
+       * Fix: implement time.h wrapper for FD_ISSET
+       * Fix: update sched instrumentation for 3.19+ kernels
+       * Fix: update rcu instrumentation for 3.19+ kernels
+       * Fix: update scsi instrumentation for 3.19+ kernels
+       * Fix: update module instrumentation for 3.19+ kernels
+       * Fix: Add f_dentry wrapper for 3.19+ kernels
+       * Fix: introduce lttng_get_unused_fd() wrapper for 3.19 kernels
+       * Fix: lttng_this_cpu_ptr wrapper for kernel 3.19+
+       * Fix: Update btrfs instrumentation for 3.18 Linux kernel
+       * Fix compile error on kernel 3.0.101 with CONFIG_PERF_EVENTS
+       * Conditional compilation introduced by lttng-modules commit
+
 2014-12-12 LTTng modules 2.6.0-rc2
        * Fix: compaction instrumentation update for 3.14.x stable kernels
        * Fix: context alignment not properly handled

diff --git a/lttng-tracer.h b/lttng-tracer.h
index 686905e02b4cfb24baf80920d70270f06b19a638..f658c8ed8ea039e1b8c5859cbce1dd55e145f3f0 100644 (file)
--- a/lttng-tracer.h
+++ b/lttng-tracer.h
@@ -42,7 +42,7 @@
 #define LTTNG_MODULES_MAJOR_VERSION 2
 #define LTTNG_MODULES_MINOR_VERSION 6
 #define LTTNG_MODULES_PATCHLEVEL_VERSION 0
-#define LTTNG_MODULES_EXTRAVERSION "-rc2"
+#define LTTNG_MODULES_EXTRAVERSION ""
 
 #define LTTNG_VERSION_NAME             "Gaia"
 #define LTTNG_VERSION_DESCRIPTION      \