Merge
authorduke
Thu, 24 Aug 2017 16:30:20 +0200
changeset 45954 58c92a58e1ef
parent 45953 a3c10d5df818 (diff)
parent 45952 4743dfc4a2ef (current diff)
child 45957 d3eb7790a38d
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/jaxp/.hgtags	Thu Aug 24 16:30:16 2017 +0200
+++ b/jaxp/.hgtags	Thu Aug 24 16:30:20 2017 +0200
@@ -436,3 +436,4 @@
 38cf34e2328070cc691c4f136e6dde1a44c04171 jdk-9+176
 332ad9f92632f56f337b8c40edef9a95a42b26bc jdk-9+177
 02a876781a3a6193140591d92db7b95ca743eac2 jdk-10+15
+d109d55cf642bf2b438624e81f94c18c168f9178 jdk-10+16