# HG changeset patch
# User Yasumasa Suenaga  <yasuenag@gmail.com>
# Date 1405518883 -32400
# Node ID 835c846563fb0e4146955841eb1623d2d2279833
# Parent  6122238e585592d7187e4c8947d839d19e9965da
Bug 1866: HeapStats agent should be adapted to JDK-8032235
reviewed-by: ykubota

diff -r 6122238e5855 -r 835c846563fb agent/ChangeLog
--- a/agent/ChangeLog	Wed Jul 16 17:30:48 2014 +0900
+++ b/agent/ChangeLog	Wed Jul 16 22:54:43 2014 +0900
@@ -1,3 +1,11 @@
+2014-07-16  Yasumasa Suenaga  <yasuenag@gmail.com>
+
+	* Bug 1866: HeapStats agent should be adapted to JDK-8032235
+
+2014-07-16  KUBOTA Yuji  <kubota.yuji@lab.ntt.co.jp>
+
+	* Bug 1861: Improve the messaging about gathering stdout/stderr.
+
 2014-07-07  Yasumasa Suenaga  <yasuenag@gmail.com>
 
 	* Bug 1855: Build failed on Gentoo
diff -r 6122238e5855 -r 835c846563fb agent/src/oopUtil.cpp
--- a/agent/src/oopUtil.cpp	Wed Jul 16 17:30:48 2014 +0900
+++ b/agent/src/oopUtil.cpp	Wed Jul 16 22:54:43 2014 +0900
@@ -2893,9 +2893,8 @@
         /*
          * See JDK-8027746:
          * Remove do_gen_barrier template parameter in G1ParCopyClosure
-         * (jdk9-b03: 1.9.0-b03)
          */
-        const unsigned int afterCR8027746 = 26 << 24 | 9 << 16 | 3;
+        const unsigned int afterCR8027746 = 25 << 24 | 20 << 16 | 2;
         enableCR8027746 = (hotSpotVersion >= afterCR8027746);
 
         /*