Update version to v2.6.0-rc2

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

diff --git a/ChangeLog b/ChangeLog
index ec3c0a3e42d906042d59161ca52de0f3d6d5ef7e..334a79cca09a142599514c30ed4d3f4dcd64d23b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-21 lttng-tools 2.6.0-rc2
+       * Use lttng-modules ABI version ioctl
+       * Fix: syscall list ioctl number conflict
+
 2014-10-20 lttng-tools 2.6.0-rc1 (Harry Belafonte records Banana Boat Song)
        * Machine Interface added to lttng command line (--mi)
        * Java Log4j agent support (--log4j)

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