# HG changeset patch
# User iignatyev
# Date 1444266269 0
# Node ID 79da1ca4462278f5ff7e2086cbb8a88164ad5f4f
# Parent  0027c6eaf1a99fe7ebd31d2f139cd6c88991cd83# Parent  7ff907b9d3771e213540045178ef6f609b369da7
Merge

diff -r 0027c6eaf1a9 -r 79da1ca44622 hotspot/test/gc/g1/mixedgc/TestLogging.java
--- a/hotspot/test/gc/g1/mixedgc/TestLogging.java	Wed Oct 07 22:54:08 2015 +0000
+++ b/hotspot/test/gc/g1/mixedgc/TestLogging.java	Thu Oct 08 01:04:29 2015 +0000
@@ -26,6 +26,7 @@
  * @summary Check that a mixed GC is reflected in the gc logs
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @library /testlibrary /../../test/lib
+ * @ignore 8138607
  * @modules java.management
  * @build sun.hotspot.WhiteBox gc.g1.mixedgc.TestLogging
  * @run main ClassFileInstaller sun.hotspot.WhiteBox