From b82b303277fd212f93f5ef318c3a1abf539ac30e Mon Sep 17 00:00:00 2001 From: David Goulet Date: Mon, 20 Oct 2014 13:17:42 -0400 Subject: [PATCH] Update version to v2.6.0-rc1 Signed-off-by: David Goulet --- ChangeLog | 6 ++++++ configure.ac | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65aa7df53..ec3c0a3e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +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) + * Kernel per syscall tracing + * Multiple fixes. + 2014-07-16 lttng-tools 2.5.0 (Take Your Poet to Work Day) * Fix: validate file path creds in autoload mode * Fix: change session file loading order diff --git a/configure.ac b/configure.ac index 7b9a2fb4f..487a2b978 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([lttng-tools],[2.5.0-rc2],[dgoulet@efficios.com],[],[http://lttng.org]) +AC_INIT([lttng-tools],[2.6.0-rc1],[dgoulet@efficios.com],[],[http://lttng.org]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET AC_CANONICAL_HOST @@ -19,8 +19,8 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [LTTng-Tools major version n AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [LTTng-Tools minor version number]) AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [LTTng-Tools patchlevel version number]) -version_name="Fumisterie" -version_description="The Fumisterie is a beer whose style is at the confluence of English and German ales. On the palate, it is full-bodied, malty and slightly caramelized. The organic hemp seeds incorporated during the brewing gives it a unique and original taste. The hop flavour comes through delicately in the after taste." +version_name="Gaia" +version_description="From Benelux brewery in Montreal, the Gaia is a witbier with a cloudy light amber ale color. Aroma of coriander with floral hay notes is enchanting. Taste is also dominated by the very floral coriander note and some medium sweet malt notes." AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "") AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], "") -- 2.34.1