Update version to v1.4.0

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/ChangeLog b/ChangeLog
index c595ac1e757c20d92f4b4177e5504875138b1758..4fa713cdd747b72bcb94122db1bbc65adda5a150 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2016-06-06 babeltrace 1.4.0 (National Yo-Yo Day)
+       * Tests: dereference of NULL pointer on allocation failure
+       * Tests: abort dwarf test on open() failure
+       * Fix: lttng-live does not set a trace descriptor
+       * Tests: Add missing --merge LOG_DRIVER_FLAGS
+       * Fix: strerror_r behavior is glibc specific
+       * sys/param.h is required for MAXNAMLEN on musl libc
+       * Fix: undefined bit shift operation when printing octal numbers
+       * Fix: Wrong variable checked in bin_info_child_die_has_address
+       * Fix: Only close valid fds in is_valid_debug_file
+       * Fix: Free die_name in bin_info_lookup_cu_function_name
+       * Fix: Don't dereference null ptr in error path
+       * Standardise spelling of debug info
+       * Fix: typo in --disable-debug-info in configure error message
+       * Docs: change --clock-raw to --clock-cycles
+       * Fix: segmentation fault with multi-trace having non-correlated clocks
+
 2016-05-13 babeltrace 1.4.0-rc1
        * Display binary location even if source and symbol lookups fail
        * Tests: Multi-trace stream intersection test

diff --git a/configure.ac b/configure.ac
index a08ec11385c6a227d2e3ea811591ff92366f8023..0b7bde25d77c4ba90689550f6a2b4c9c55922994 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([babeltrace],[1.4.0-rc1],[jeremie.galarneau@efficios.com],[],[https://diamon.org/babeltrace])
+AC_INIT([babeltrace],[1.4.0],[jeremie.galarneau@efficios.com],[],[https://diamon.org/babeltrace])
 AC_SUBST([BABELTRACE_LIBRARY_VERSION], [1:0:0])
 
 AC_CONFIG_HEADERS([config.h])