From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 11 Jul 2013 17:58:09 +0000 (-0400)
Subject: Version 2.2.1
X-Git-Tag: v2.2.1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a19e1db0692b71b9e8d496674900210fddf2d42b;p=lttng-ust.git

Version 2.2.1

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

diff --git a/ChangeLog b/ChangeLog
index 3c8db2c0..ec15e3b2 100644
--- 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 59f747c3..00b13280 100644
--- 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