Merge
authorlana
Thu, 11 Jun 2015 20:18:55 -0700
changeset 31086 d24a2c340a47
parent 31056 07cd15548b1b (diff)
parent 31085 9bde92d55eae (current diff)
child 31087 59d2a5d94dd6
Merge
jdk/src/java.base/share/classes/sun/misc/ExtensionDependency.java
jdk/src/java.base/share/classes/sun/misc/ExtensionInfo.java
jdk/src/java.base/share/classes/sun/misc/ExtensionInstallationException.java
jdk/src/java.base/share/classes/sun/misc/ExtensionInstallationProvider.java
jdk/test/sun/tools/jmap/heapconfig/LingeredApp.java
jdk/test/sun/tools/jmap/heapconfig/LingeredAppTest.java
--- a/jdk/.hgtags	Thu Jun 11 10:38:29 2015 -0700
+++ b/jdk/.hgtags	Thu Jun 11 20:18:55 2015 -0700
@@ -310,3 +310,4 @@
 ed94f3e7ba6bbfec0772de6d24e39543e13f6d88 jdk9-b65
 4fbcca8ab812198c7fb747ea7b213b6e404f36e9 jdk9-b66
 1abd45df5480a04bff98fba1851d66a5230e67d4 jdk9-b67
+046fd17bb9a0cdf6681124866df9626d17b0516a jdk9-b68