Version 2.2.1

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/ChangeLog b/ChangeLog
index 3c8db2c07b96ec893de8a3034cf0d96df53fe107..ec15e3b26a4ec0823a1587935a6d22b95baffa92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-07-11 lttng-ust 2.2.1
+       * Fix: libs order in Makefile
+       * Fix: ring buffer: get_subbuf() checks should be performed on "consumed" 
+       * build: Fix out-of-tree build
+       * Fix: SWITCH_FLUSH new sub-buffer checks
+       * Fix: ring buffer: handle concurrent update in nested buffer wrap around 
+       * Fix: handle writes of length 0
+       * Fix: incorrect release dates in Changelog
+
 2013-06-25 lttng-ust 2.2.0
        * Disable doc/examples build
        * Fix: lttng-events VPATH build

diff --git a/configure.ac b/configure.ac
index 59f747c3f062e35ee490cdbc450e5a415526cc59..00b132807aaee07a8fd26f1f4da83526fc085a61 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[2.2.0],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.2.1],[mathieu dot desnoyers at efficios dot com])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html