X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ChangeLog;h=3d1cbcc4a08db8da30a741bb5f7f52845b15634b;hb=3685664308de300b6612e706a2478121eb282c53;hp=262e49f22265d65b854c3f454d8d37cd68eeb8f1;hpb=59d82da5ffc9c562d8345d26d793e407fbf57370;p=lttng-ust.git

diff --git a/ChangeLog b/ChangeLog
index 262e49f2..3d1cbcc4 100644
--- 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