Merge
authorjcoomes
Fri, 23 May 2014 10:28:09 -0700
changeset 24490 8e732d204328
parent 24448 6a343232ff19 (diff)
parent 24489 de383df95d5c (current diff)
child 24491 33d2a5b12a34
Merge
hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciReceiverTypeData.java
hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciVirtualCallData.java
hotspot/test/runtime/7110720/Test7110720.sh
hotspot/test/runtime/SharedArchiveFile/CdsWriteError.java
hotspot/test/testlibrary/com/oracle/java/testlibrary/DynamicVMOptionChecker.java
hotspot/test/testlibrary/com/oracle/java/testlibrary/TestDynamicVMOption.java
--- a/hotspot/.hgtags	Thu May 22 16:26:05 2014 -0700
+++ b/hotspot/.hgtags	Fri May 23 10:28:09 2014 -0700
@@ -416,3 +416,4 @@
 783309c3a1a629a452673399dcfa83ef7eca94d8 jdk9-b11
 1c383bb39e2849ca62cb763f4e182a29b421d60a jdk9-b12
 456ad9c99133803d4e1433124c85a6fd141b9ac9 jdk9-b13
+bd333491bb6c012d7b606939406d0fa9a5ac7ffd jdk9-b14