Merge
authorduke
Wed, 05 Jul 2017 23:33:00 +0200
changeset 45306 ced081f0007b
parent 45305 bb38aa61b727 (diff)
parent 45302 3b471ff2785c (current diff)
child 45310 475d2eee0071
Merge
jdk/make/data/docs-resources/specs/resources/jdk-default.css
jdk/test/java/io/Serializable/evolution/AddedExternField/run.sh
jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh
jdk/test/java/io/Serializable/maskSyntheticModifier/Test.java
jdk/test/java/io/Serializable/maskSyntheticModifier/run.sh
jdk/test/java/io/Serializable/packageAccess/Test.java
jdk/test/java/io/Serializable/packageAccess/run.sh
jdk/test/java/io/Serializable/resolveClass/consTest/Test.java
jdk/test/java/io/Serializable/resolveClass/consTest/run.sh
jdk/test/java/io/Serializable/resolveClass/deserializeButton/Test.java
jdk/test/java/io/Serializable/resolveClass/deserializeButton/run.sh
jdk/test/java/io/Serializable/serialver/classpath/Test.java
jdk/test/java/io/Serializable/serialver/classpath/run.sh
jdk/test/java/io/Serializable/serialver/nested/Test.java
jdk/test/java/io/Serializable/serialver/nested/run.sh
jdk/test/java/io/Serializable/subclass/Test.java
jdk/test/java/io/Serializable/subclass/run.sh
jdk/test/java/io/Serializable/superclassDataLoss/Test.java
jdk/test/java/io/Serializable/superclassDataLoss/run.sh
jdk/test/java/io/Serializable/unnamedPackageSwitch/Test.java
jdk/test/java/io/Serializable/unnamedPackageSwitch/run.sh
jdk/test/java/net/Socket/OldSocketImpl.sh
jdk/test/java/net/URL/B5086147.sh
jdk/test/java/net/URLClassLoader/B5077773.java
jdk/test/java/net/URLClassLoader/B5077773.sh
jdk/test/java/net/URLClassLoader/closetest/build.sh
jdk/test/java/net/URLClassLoader/closetest/build2.sh
jdk/test/java/net/URLClassLoader/getresourceasstream/test.sh
jdk/test/java/net/URLClassLoader/sealing/checksealed.sh
jdk/test/java/net/URLConnection/6212146/test.sh
jdk/test/java/net/URLConnection/UNCTest.sh
jdk/test/java/nio/Buffer/LimitDirectMemory.sh
jdk/test/java/nio/channels/AsynchronousChannelGroup/Attack.java
jdk/test/java/nio/channels/AsynchronousChannelGroup/PrivilegedThreadFactory.java
jdk/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh
jdk/test/lib/testlibrary/JavaToolUtils.java
jdk/test/lib/testlibrary/jdk/testlibrary/FileUtils.java
jdk/test/lib/testlibrary/jdk/testlibrary/JarUtils.java
jdk/test/lib/testlibrary/jsr292/com/oracle/testlibrary/jsr292/CodeCacheOverflowProcessor.java
jdk/test/lib/testlibrary/jsr292/com/oracle/testlibrary/jsr292/Helper.java
jdk/test/tools/jar/multiRelease/data/runtimetest/base/testpackage/Helper.java
jdk/test/tools/jar/multiRelease/data/runtimetest/base/testpackage/Main.java
jdk/test/tools/jar/multiRelease/data/runtimetest/base/versionResource
jdk/test/tools/jar/multiRelease/data/runtimetest/v10/testpackage/Helper.java
jdk/test/tools/jar/multiRelease/data/runtimetest/v10/testpackage/Main.java
jdk/test/tools/jar/multiRelease/data/runtimetest/v10/versionResource
jdk/test/tools/jar/multiRelease/data/runtimetest/v9/testpackage/Helper.java
jdk/test/tools/jar/multiRelease/data/runtimetest/v9/testpackage/Main.java
jdk/test/tools/jar/multiRelease/data/runtimetest/v9/versionResource
test/lib/jdk/test/lib/wrappers/InfiniteLoop.java
test/lib/jdk/test/lib/wrappers/TimeLimitedRunner.java
--- a/nashorn/.hgtags	Wed Jul 05 23:32:48 2017 +0200
+++ b/nashorn/.hgtags	Wed Jul 05 23:33:00 2017 +0200
@@ -413,3 +413,5 @@
 550bfc15779f8f339610793867fdc251125811b5 jdk-9+170
 7e9cb37e6d6edbe56fdf4d510e5110f797823f09 jdk-10+7
 edb825e2dfb140c8e57a61b5d45de19edebccccf jdk-10+8
+d7d69c89088aec56d13bbff81a6f0a8b68ca75f4 jdk-10+9
+fc416270a776409b74006262dd0a9f5f5ff31555 jdk-9+171