hg: panama/dev: manual merge with default
sandhya.viswanathan at intel.com
sandhya.viswanathan at intel.com
Thu Jan 16 20:01:44 UTC 2020
Changeset: ff41bf2c7a7c
Author: sviswanathan
Date: 2020-01-16 12:00 -0800
URL: https://hg.openjdk.java.net/panama/dev/rev/ff41bf2c7a7c
manual merge with default
! src/hotspot/cpu/aarch64/aarch64.ad
! src/hotspot/cpu/aarch64/assembler_aarch64.hpp
! src/hotspot/cpu/aarch64/globals_aarch64.hpp
! src/hotspot/cpu/arm/arm.ad
! src/hotspot/cpu/ppc/ppc.ad
! src/hotspot/cpu/s390/s390.ad
! src/hotspot/cpu/s390/sharedRuntime_s390.cpp
! src/hotspot/cpu/sparc/sparc.ad
! src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
! src/hotspot/cpu/x86/x86.ad
! src/hotspot/share/opto/c2_globals.hpp
! src/hotspot/share/opto/cfgnode.cpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/compile.hpp
! src/hotspot/share/opto/matcher.cpp
! src/hotspot/share/opto/matcher.hpp
! src/hotspot/share/opto/memnode.cpp
! src/hotspot/share/opto/parse2.cpp
! src/hotspot/share/opto/vectornode.cpp
! src/hotspot/share/opto/vectornode.hpp
- src/hotspot/share/runtime/flags/jvmFlagWriteableList.cpp
- src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp
! src/hotspot/share/runtime/globals.hpp
! src/java.base/share/classes/java/lang/Class.java
- src/java.base/share/classes/sun/net/idn/Punycode.java
- src/java.base/share/classes/sun/net/idn/StringPrep.java
- src/java.base/share/classes/sun/net/idn/StringPrepDataReader.java
- src/java.base/share/classes/sun/net/idn/UCharacterDirection.java
- src/java.base/share/classes/sun/net/idn/UCharacterEnums.java
- src/java.base/share/classes/sun/text/bidi/BidiBase.java
- src/java.base/share/classes/sun/text/bidi/BidiLine.java
- src/java.base/share/classes/sun/text/bidi/BidiRun.java
- src/java.base/share/classes/sun/text/bidi/BidiWriter.java
- src/java.base/share/classes/sun/text/normalizer/BMPSet.java
- src/java.base/share/classes/sun/text/normalizer/CharTrie.java
- src/java.base/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java
- src/java.base/share/classes/sun/text/normalizer/CodePointMap.java
- src/java.base/share/classes/sun/text/normalizer/CodePointTrie.java
- src/java.base/share/classes/sun/text/normalizer/FilteredNormalizer2.java
- src/java.base/share/classes/sun/text/normalizer/ICUBinary.java
- src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java
- src/java.base/share/classes/sun/text/normalizer/Normalizer2.java
- src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java
- src/java.base/share/classes/sun/text/normalizer/NormalizerImpl.java
- src/java.base/share/classes/sun/text/normalizer/OutputInt.java
- src/java.base/share/classes/sun/text/normalizer/Replaceable.java
- src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java
- src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java
- src/java.base/share/classes/sun/text/normalizer/Trie.java
- src/java.base/share/classes/sun/text/normalizer/Trie2.java
- src/java.base/share/classes/sun/text/normalizer/Trie2_16.java
- src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java
- src/java.base/share/classes/sun/text/normalizer/UCharacter.java
- src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java
- src/java.base/share/classes/sun/text/normalizer/UCharacterProperty.java
- src/java.base/share/classes/sun/text/normalizer/UTF16.java
- src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java
- src/java.base/share/classes/sun/text/normalizer/UnicodeSetStringSpan.java
- src/java.base/share/classes/sun/text/normalizer/Utility.java
- src/java.base/share/classes/sun/text/normalizer/VersionInfo.java
- src/java.base/share/classes/sun/text/resources/nfc.nrm
- src/java.base/share/classes/sun/text/resources/nfkc.nrm
- src/java.base/share/classes/sun/text/resources/ubidi.icu
- src/java.base/share/classes/sun/text/resources/uprops.icu
- test/jdk/jdk/jfr/api/consumer/recordingstream/TestSetFlushInterval.java
- test/jdk/jdk/jfr/api/recording/time/TestSetFlushInterval.java
More information about the panama-dev
mailing list