hg: panama/dev: manual merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Thu Dec 6 11:43:55 UTC 2018


Changeset: fceed9421539
Author:    mcimadamore
Date:      2018-12-06 11:43 +0000
URL:       http://hg.openjdk.java.net/panama/dev/rev/fceed9421539

manual merge with default

! bin/idea.sh
! make/CompileDemos.gmk
! make/RunTests.gmk
! make/autoconf/flags.m4
! make/autoconf/spec.gmk.in
! make/conf/jib-profiles.js
- make/nashorn/package-list
! make/test/JtregNativeJdk.gmk
! src/java.base/share/classes/java/lang/System.java
- src/java.desktop/macosx/native/libsplashscreen/libpng/zlibwrapper/zlib.h
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/Command.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/Execute.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/HelpCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/JSONWriter.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/PrettyWriter.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/PrintCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/ReconstructCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/SplitCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/StructuredWriter.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/SummaryCommand.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/cmd/XMLWriter.java
- test/jdk/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html
- test/jdk/java/util/Properties/Compatibility.xml
- test/jdk/java/util/Properties/CompatibilityTest.java
- test/jdk/jdk/jfr/cmd/ExecuteHelper.java
- test/jdk/jdk/jfr/cmd/TestHelp.java
- test/jdk/jdk/jfr/cmd/TestPrint.java
- test/jdk/jdk/jfr/cmd/TestPrintDefault.java
- test/jdk/jdk/jfr/cmd/TestPrintJSON.java
- test/jdk/jdk/jfr/cmd/TestPrintXML.java
- test/jdk/jdk/jfr/cmd/TestReconstruct.java
- test/jdk/jdk/jfr/cmd/TestSplit.java
- test/jdk/jdk/jfr/cmd/TestSummary.java
- test/jdk/lib/testlibrary/ExtendedRobot.java
! test/jdk/tools/launcher/HelpFlagsTest.java
! test/jdk/tools/launcher/VersionCheck.java



More information about the panama-dev mailing list