Merge jdk-10+15
authorduke
Thu, 24 Aug 2017 16:29:13 +0200
changeset 45871 878e21603932
parent 45870 dc8a97f11d6b (current diff)
parent 45820 a1cab39df890 (diff)
child 45872 634f193b7716
child 45873 94940d8e375b
child 45879 07c0f17dc7bb
child 45881 aaec0fbe17ae
child 45896 f0d4cef9bbae
child 45898 f66344672e6c
child 45901 1580f87d2a32
child 45905 206ece55c5b5
child 45907 656a844c382d
Merge
.hgtags
hotspot/src/cpu/aarch64/vm/c2_globals_aarch64.hpp
hotspot/src/cpu/arm/vm/c2_globals_arm.hpp
hotspot/src/cpu/ppc/vm/c2_globals_ppc.hpp
hotspot/src/cpu/s390/vm/c2_globals_s390.hpp
hotspot/src/cpu/sparc/vm/c2_globals_sparc.hpp
hotspot/src/cpu/x86/vm/c2_globals_x86.hpp
hotspot/src/cpu/x86/vm/globals_x86.hpp
hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java
hotspot/src/share/vm/opto/c2_globals.hpp
hotspot/test/compiler/rangechecks/TestRangeCheckEliminationDisabled.java
jdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
jdk/test/java/util/stream/bootlib/java.base/java/util/SpliteratorTestHelper.java
jdk/test/lib/testlibrary/bootlib/java.base/java/util/SpliteratorOfIntDataBuilder.java
jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/DoubleStreamTestScenario.java
jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/IntStreamTestScenario.java
jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/LongStreamTestScenario.java
jdk/test/lib/testlibrary/bootlib/java.base/java/util/stream/StreamTestScenario.java
jdk/test/lib/testlibrary/jdk/testlibrary/NetworkConfiguration.java
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/Negative.java
--- a/.hgtags	Thu Aug 24 16:29:01 2017 +0200
+++ b/.hgtags	Thu Aug 24 16:29:13 2017 +0200
@@ -1,3 +1,6 @@
+43bf6f30fcba031ecf0cc7e511efe3a8179d0f77 jdk-9+176
+d9f6bc6ba599d0487dc18b2fbdb6c34eedf6f958 jdk-9+177
+bc9df7dd63ec76f50fafeb4acc44465044662f0a jdk-9+178
 994036e74ab805bcc09afa0646be17a725bec42f jdk-9+175
 94680c6d60ecd9ed3ffd1847706efde7eb947afc jdk-9+174
 6dd7fda42bab7ecf648cafb0a4e9b4ca11b3094f jdk-9+173