From b6cf3d150918c8a4c183c31e1da94fc06a967b9b Mon Sep 17 00:00:00 2001 From: David Goulet Date: Tue, 21 Oct 2014 14:14:42 -0400 Subject: [PATCH] Update version to v2.6.0-rc2 Signed-off-by: David Goulet --- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ec3c0a3e4..334a79cca 100644 --- 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 487a2b978..b3adf9c46 100644 --- 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 -- 2.34.1