Merge
authorduke
Thu, 24 Aug 2017 16:30:27 +0200
changeset 45959 554ed368461d
parent 45958 7ee858174605 (diff)
parent 45957 d3eb7790a38d (current diff)
child 45960 7db699468b4f
Merge
jdk/src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java
jdk/test/java/lang/ClassLoader/deadlock/Alice.java
jdk/test/java/lang/ClassLoader/deadlock/Bob.java
jdk/test/java/lang/ClassLoader/deadlock/Starter.java
jdk/test/java/lang/ClassLoader/deadlock/SupAlice.java
jdk/test/java/lang/ClassLoader/deadlock/SupBob.java
jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/EditPad.java
--- a/langtools/.hgtags	Thu Aug 24 16:30:23 2017 +0200
+++ b/langtools/.hgtags	Thu Aug 24 16:30:27 2017 +0200
@@ -436,3 +436,4 @@
 0d0ac75b0f6cbe218362e3fac4bb443496e7258f jdk-9+176
 2f01728210c1405ef459e69d9c7247b5df6abb78 jdk-9+177
 2b9273266ea629ca686239c416a7ff8a592d822a jdk-10+15
+4070d214e88729006184a4abbe8f494fcec6afb6 jdk-10+16