X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ChangeLog;h=334a79cca09a142599514c30ed4d3f4dcd64d23b;hb=b6cf3d150918c8a4c183c31e1da94fc06a967b9b;hp=ec3c0a3e42d906042d59161ca52de0f3d6d5ef7e;hpb=084cb5fec17c87a391c7ee7596caf5adfd7d3766;p=lttng-tools.git

diff --git a/ChangeLog b/ChangeLog
index ec3c0a3e4..334a79cca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-21 lttng-tools 2.6.0-rc2
+	* Use lttng-modules ABI version ioctl
+	* Fix: syscall list ioctl number conflict
+
 2014-10-20 lttng-tools 2.6.0-rc1 (Harry Belafonte records Banana Boat Song)
 	* Machine Interface added to lttng command line (--mi)
 	* Java Log4j agent support (--log4j)