Version 2.6.0-rc2

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

diff --git a/ChangeLog b/ChangeLog
index bdb6f35b44519e368d845e5370aa34a1e4b1098e..51fbf15c58df03d7ec6c971b09df8aac3b746fcf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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
+       * Fix compilation on Linux kernel >= 3.18.0
+       * Fix: build for architectures without HAVE_SYSCALL_TRACEPOINTS
+
 2014-10-20 LTTng modules 2.6.0-rc1
        * Expose lttng-modules ABI version ioctl
        * Fix: syscall list ioctl number conflict

diff --git a/lttng-tracer.h b/lttng-tracer.h
index b90bcb4f093e78b5bf2657833cfeb9e21e65fd98..686905e02b4cfb24baf80920d70270f06b19a638 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 "-rc1"
+#define LTTNG_MODULES_EXTRAVERSION "-rc2"
 
 #define LTTNG_VERSION_NAME             "Gaia"
 #define LTTNG_VERSION_DESCRIPTION      \