From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 28 Feb 2014 18:12:39 +0000 (-0500)
Subject: Version 1.2.0
X-Git-Tag: v1.2.0^0
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=8327bb6865552731578a5c1389ed61af784f6127

Version 1.2.0

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

diff --git a/ChangeLog b/ChangeLog
index 61dac432..83e328df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-02-28 Babeltrace 1.2.0
+	* Fix: lttng-live parse url port check
+
 2014-02-27 Babeltrace 1.2.0-rc2
 	* Fix: events discarded timing inaccuracy
 	* Fix: Move offset endianness conversion to get_data_packet
diff --git a/configure.ac b/configure.ac
index bc81a66d..7a986126 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([babeltrace],[1.2.0-rc2],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([babeltrace],[1.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