Merge
authorduke
Wed, 05 Jul 2017 22:49:52 +0200
changeset 43643 0b4a58f0aa7e
parent 43642 4c73666bd173 (diff)
parent 43638 311d8a2bb915 (current diff)
child 43650 f8fec3cbf201
Merge
hotspot/test/gc/arguments/TestExplicitGCInvokesConcurrentAndUnloadsClasses.java
hotspot/test/gc/startup_warnings/TestDefNewCMS.java
hotspot/test/gc/startup_warnings/TestParNewCMS.java
hotspot/test/gc/startup_warnings/TestParNewSerialOld.java
hotspot/test/gc/startup_warnings/TestUseAutoGCSelectPolicy.java
hotspot/test/runtime/NMT/AutoshutdownNMT.java
jdk/src/java.base/unix/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
--- a/jaxws/.hgtags	Wed Jul 05 22:49:42 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 22:49:52 2017 +0200
@@ -399,5 +399,7 @@
 c48b4d4768b1c2b8fe5d1a844ca13732e5dfbe2a jdk-9+151
 6f8fb1cf7e5f61c40dcc3654f9a623c505f6de1f jdk-9+152
 7a532a9a227137155b905341d4b99939db51220e jdk-9+153
+34af95c7dbff74f3448fcdb7d745524e8a1cc88a jdk-10+0
 34af95c7dbff74f3448fcdb7d745524e8a1cc88a jdk-9+154
 9b9918656c97724fd89c04a8547043bbd37f5935 jdk-9+155
+7c829eba781409b4fe15392639289af1553dcf63 jdk-9+156
--- a/jaxws/.jcheck/conf	Wed Jul 05 22:49:42 2017 +0200
+++ b/jaxws/.jcheck/conf	Wed Jul 05 22:49:52 2017 +0200
@@ -1,1 +1,1 @@
-project=jdk9
+project=jdk10