Version 2.2.0

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

diff --git a/ChangeLog b/ChangeLog
index e5d877a82b8835fd462fcc44ffd243a9358101a3..7969df11de9faf447fe9695793cd1d8a43ae20f1 100644 (file)
--- 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 ef5cf240f8423f3683133ec725d22e5c0e0d2ad1..59f747c3f062e35ee490cdbc450e5a415526cc59 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-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