Version 2.10.0-rc2

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

diff --git a/ChangeLog b/ChangeLog
index 262e49f22265d65b854c3f454d8d37cd68eeb8f1..3d1cbcc4a08db8da30a741bb5f7f52845b15634b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-06-12 (National Peanut Butter Cookie Day) lttng-ust 2.10.0-rc2
+       * Introduce LTTNG_UST_ALLOW_BLOCKING env. var.
+       * Fix: lttng-ust-elf.c: define NT_GNU_BUILD_ID if not defined
+       * Fix: Quote CMAKE variable assignment in Makefile
+       * Rework configure script
+       * Fix: Typo in doc/examples/Makefile.am
+       * Fix: Don't override user variables within the build system
+       * Move m4 scripts to m4 dir
+       * doc: remove duplicate LTTNG_UST_BLOCKING_RETRY_TIMEOUT man page entry
+
 2017-05-05 (International Tuba Day) lttng-ust 2.10.0-rc1
        * Clean-up: remove unused variables to silence gcc warning
        * Add ustctl_snapshot_sample_positions ustctl command

diff --git a/configure.ac b/configure.ac
index e2acfa9057bbd20a0cefcb104c047021ab5bd10d..3ad78e01da76a0fc5f962aaccbb9b6e9098a828b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Version infos
 m4_define([V_MAJOR], [2])
 m4_define([V_MINOR], [10])
 m4_define([V_PATCH], [0])
-m4_define([V_EXTRA], [rc1])
+m4_define([V_EXTRA], [rc2])
 m4_define([V_NAME], [[KeKriek]])
 m4_define([V_DESC], [[From Brasserie Dunham, a sour mashed golden wheat ale fermented with local sour cherries from Tougas orchards. Fresh sweet cherry notes with some tartness, lively carbonation with a dry finish.]])