# HG changeset patch
# User amurillo
# Date 1430550989 25200
# Node ID 3d55863a66ba477a322edd220956a432c79b6ab6
# Parent  05608c16f6bfc2f56883d680174565218055e11f# Parent  43a324d3e0ceb52b3fc2817ff1ee0fff5bb41529
Merge

diff -r 05608c16f6bf -r 3d55863a66ba hotspot/test/compiler/jsr292/CallSiteDepContextTest.java
--- a/hotspot/test/compiler/jsr292/CallSiteDepContextTest.java	Fri May 01 03:56:01 2015 -0700
+++ b/hotspot/test/compiler/jsr292/CallSiteDepContextTest.java	Sat May 02 00:16:29 2015 -0700
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8057967
+ * @ignore 8079205
  * @run main/bootclasspath -Xbatch java.lang.invoke.CallSiteDepContextTest
  */
 package java.lang.invoke;
diff -r 05608c16f6bf -r 3d55863a66ba hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java
--- a/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java	Fri May 01 03:56:01 2015 -0700
+++ b/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java	Sat May 02 00:16:29 2015 -0700
@@ -24,6 +24,7 @@
 /*
  * @test TestLargePageUseForAuxMemory.java
  * @bug 8058354
+ * @ignore 8079208
  * @key gc
  * @library /testlibrary /../../test/lib
  * @requires (vm.gc=="G1" | vm.gc=="null")