hg: amber/amber: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Mon Jan 27 10:46:52 UTC 2020


Changeset: 744575d35ad5
Author:    mcimadamore
Date:      2020-01-27 10:46 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/744575d35ad5

Automatic merge with default

- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.cpp
- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.hpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.hpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.hpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.cpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.hpp
- src/hotspot/share/gc/parallel/psMarkSweep.cpp
- src/hotspot/share/gc/parallel/psMarkSweep.hpp
- src/hotspot/share/gc/parallel/psMarkSweepDecorator.cpp
- src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp
- src/hotspot/share/gc/parallel/psMarkSweepProxy.hpp
- src/hotspot/share/runtime/flags/jvmFlagWriteableList.cpp
- src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp
- src/java.base/share/classes/java/time/chrono/hijrah-config-islamic-umalqura.properties
- 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
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
- test/hotspot/jtreg/runtime/records/TEST.properties
- test/jdk/java/io/Serializable/records/TEST.properties
- test/jdk/java/lang/instrument/TEST.properties
- test/jdk/java/lang/reflect/records/TEST.properties
- test/jdk/java/lang/runtime/TEST.properties
- test/jdk/jdk/jfr/api/consumer/recordingstream/TestSetFlushInterval.java
- test/jdk/jdk/jfr/api/recording/time/TestSetFlushInterval.java
- test/jdk/sun/security/krb5/auto/SaslGSS.java



More information about the amber-dev mailing list