From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 25 Jun 2013 21:43:10 +0000 (-0400)
Subject: Version 2.2.0
X-Git-Tag: v2.2.0^0
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e54bcf549bf588744d09a58696cc9fc694343616;p=lttng-ust.git

Version 2.2.0

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

diff --git a/ChangeLog b/ChangeLog
index e5d877a8..7969df11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-09 lttng-ust 2.2.0
+	* Disable doc/examples build
+	* Fix: lttng-events VPATH build
+	* doc/examples: build gen-tp example by default
+	* doc/examples: support BSD make
+
 2013-05-09 lttng-ust 2.2.0-rc3
 	* Tracepoint.h: replace assertion by fprintf and abort()
 	* Remove unused assert.h from bitfield.h
diff --git a/configure.ac b/configure.ac
index ef5cf240..59f747c3 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-rc3],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.2.0],[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