changeset 50902:1df2b12715c3 jep-334

manual merge with default
author vromero
date Thu, 31 May 2018 06:00:40 -0700
parents a33890943673 ae67f5db7469
children 80c69f5cd21a 33e5cd5815b7
files make/BuildNashorn.gmk make/UnpackSecurity.gmk src/hotspot/os/aix/jvm_aix.cpp src/hotspot/os/bsd/jvm_bsd.cpp src/hotspot/os/linux/jvm_linux.cpp src/hotspot/os/solaris/jvm_solaris.cpp src/hotspot/share/jfr/metadata/GenerateJfrFiles.java src/hotspot/share/memory/metachunk.cpp src/hotspot/share/memory/metachunk.hpp src/java.base/share/classes/java/lang/Integer.java src/java.base/share/classes/java/lang/Long.java src/java.base/share/classes/java/lang/String.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseExecutableMemberTaglet.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BaseInlineTaglet.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/HiddenTaglet.java test/jdk/java/lang/Character/Blocks.txt test/jdk/java/lang/Character/CheckBlocks.java test/jdk/java/lang/Character/TestISOControls.java
diffstat 5385 files changed, 486398 insertions(+), 24208 deletions(-) [+]