changeset 39705:55baa0ddef24

Merge
author amurillo
date Fri, 08 Jul 2016 12:17:10 -0700
parents 157f39705057 ff5b5b94477a
children 8b8fd966478b
files
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/.hgtags	Thu May 19 13:59:50 2016 -0700
+++ b/hotspot/.hgtags	Fri Jul 08 12:17:10 2016 -0700
@@ -528,3 +528,4 @@
 75f81e1fecfb444f34f357295fe06af60e2762d9 jdk-9+123
 479631362b4930be985245ea063d87d821a472eb jdk-9+124
 bb640b49741af3f57f9994129934c46fc173219f jdk-9+125
+adc8c84b7cf8c540d920182f78a2bc982366432a jdk-9+126
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java	Thu May 19 13:59:50 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java	Fri Jul 08 12:17:10 2016 -0700
@@ -29,6 +29,7 @@
  * @modules jdk.vm.ci/jdk.vm.ci.meta
  *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.hotspot
+ * @ignore 8161068
  * @run testng/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
  *      jdk.vm.ci.hotspot.test.MethodHandleAccessProviderTest
  */