Version 1.2.0

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

diff --git a/ChangeLog b/ChangeLog
index 61dac432c7f86d394e98a0e827b682635146d94a..83e328df256f14eac8f6ba505ceac1b418176a4e 100644 (file)
--- 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 bc81a66d8199882a5b61a79e3bd785f8892ed34e..7a986126f5604a5d69574b5beee8e775443aa9c9 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([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