From 68264071f9d1b789de1350cbec479b52a9b54acf Mon Sep 17 00:00:00 2001 From: David Goulet Date: Fri, 17 Aug 2012 15:50:00 -0400 Subject: [PATCH] Update version to v2.1.0-rc1 Bump internal UST major version. Fix comments and debug output to follow this change. Signed-off-by: David Goulet --- ChangeLog | 6 ++++++ configure.ac | 6 +++--- src/bin/lttng-sessiond/ust-app.c | 4 ++-- src/bin/lttng-sessiond/ust-app.h | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7999aca5b..2706d6209 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-08-17 lttng-tools 2.1.0-rc1 + * Feature: Network Streaming + * Add the lttng-relayd binary for network streaming + * Support user space tracer filtering + * Multiple fixes + 2012-04-19 lttng-tools 2.0.1 * Fix: test script for kernel module validation * Fix: report error to client on consumerd error diff --git a/configure.ac b/configure.ac index 23a29bc0f..08bb2d293 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([lttng-tools],[2.0.1],[dgoulet@efficios.com],[],[http://lttng.org]) +AC_INIT([lttng-tools],[2.1.0-rc1],[dgoulet@efficios.com],[],[http://lttng.org]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET AC_CANONICAL_HOST @@ -6,8 +6,8 @@ AC_CONFIG_MACRO_DIR([config]) AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -version_name="Annedd'ale" -version_description="New type of beer, 100% from Quebec, flavored with sapin beaumier needles, with a touch of hops." +version_name="Basse Messe" +version_description="Light coloured German ale whose style was named after the city Cologne (Koln) where it was first brewed. It is a rather simple beer with lightly fruity aromas and a delicate hoppy fragrance. The beer has a pronounced malty taste with a subtle bitter aftertaste" AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "") AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], "") diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index 7f4e9f1e0..6a2cfc988 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -2925,7 +2925,7 @@ int ust_app_validate_version(int sock) goto error; } - DBG2("UST app PID %d is compatible with major version %d " + DBG2("UST app PID %d is compatible with internal major version %d " "(supporting == %d)", app->pid, app->version.major, UST_APP_MAJOR_VERSION); app->compatible = 1; @@ -2934,7 +2934,7 @@ int ust_app_validate_version(int sock) return 0; error: - DBG2("UST app PID %d is not compatible with major version %d " + DBG2("UST app PID %d is not compatible with internal major version %d " "(supporting == %d)", app->pid, app->version.major, UST_APP_MAJOR_VERSION); app->compatible = 0; diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h index 3f6eca126..ada517e10 100644 --- a/src/bin/lttng-sessiond/ust-app.h +++ b/src/bin/lttng-sessiond/ust-app.h @@ -24,7 +24,7 @@ /* lttng-ust supported version. */ #define LTTNG_UST_COMM_MAJOR 2 /* comm protocol major version */ -#define UST_APP_MAJOR_VERSION 2 /* UST version supported */ +#define UST_APP_MAJOR_VERSION 3 /* Internal UST version supported */ #define UST_APP_EVENT_LIST_SIZE 32 -- 2.34.1