Update version to v2.2.0-rc1

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

diff --git a/ChangeLog b/ChangeLog
index 495131ad08390a9bb1c05e06f6469f838f979311..501ef71e49a23c5a70b6c11932f6b54d24abd9a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-03-28 lttng-tools 2.2.0-rc1
+       * Add UST per UID buffers support
+       * UST metadata generation are created on the sessiond side
+       * Move LTTng-UST buffer ownership from application to consumer
+       * Add a UST registry of events and channel in the sessiond
+       * UST periodical metadata flush
+       * Refactor tests to use prove and tap
+       * Support for trace file rotation for the relayd and on disk
+       * Support per-context filtering
+       * Add channel wakeup fd to monitor close
+       * Deprecate enable/disable-consumer
+       * Multiple fixes and memory leak fix.
+
 2012-12-20 lttng-tools 2.1.0 (13th Baktun)
        * STABLE VERSION 2.1.0-stable - "Basse Messe"
        * Multiple minor fixes

diff --git a/configure.ac b/configure.ac
index e49aebedfb2d6dca0d3eb8bcc34e0f3ccaa5d280..4f85fc1e9a9fda9f80ad724d4330ff87f26ae7d6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools],[2.1.0],[dgoulet@efficios.com],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.2.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="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"
+version_name="Cuda"
+version_description="Brewed at the Benelux microbrewery, this IPA has huge floral, citric and resinous hop aroma, simply an amazing nose. The flavor is very fresh with a light caramel malting touch completing a strong body. Huge amounts of hops, lots of grapefruit, lemon and oranges. This is an outstanding IPA!"
 
 AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "")
 AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], "")