hg: amber/amber: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Wed Apr 17 17:30:26 UTC 2019


Changeset: ad399b213278
Author:    mcimadamore
Date:      2019-04-17 19:30 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/ad399b213278

Automatic merge with default

- src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.RC
- src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/external/jquery/jquery.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_65_dadada_1x400.png
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_dadada_1x400.png
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_222222_256x240.png
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_2e83ff_256x240.png
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_454545_256x240.png
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_888888_256x240.png
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/images/ui-icons_cd0a0a_256x240.png
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.3.1.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-migrate-3.0.1.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.css
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.css
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.min.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.css
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-ui.structure.min.css
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils-ie.min.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip-utils/dist/jszip-utils.min.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jszip/dist/jszip.min.js
- test/hotspot/jtreg/runtime/ErrorHandling/ExplicitArithmeticCheck.java
- test/hotspot/jtreg/runtime/Thread/MonitorCacheMaybeExpand_DeadLock.java
- test/hotspot/jtreg/runtime/containers/cgroup/PlainRead.java
- test/hotspot/jtreg/runtime/containers/docker/AttemptOOM.java
- test/hotspot/jtreg/runtime/containers/docker/CheckContainerized.java
- test/hotspot/jtreg/runtime/containers/docker/DockerBasicTest.java
- test/hotspot/jtreg/runtime/containers/docker/HelloDocker.java
- test/hotspot/jtreg/runtime/containers/docker/JfrReporter.java
- test/hotspot/jtreg/runtime/containers/docker/PrintContainerInfo.java
- test/hotspot/jtreg/runtime/containers/docker/TEST.properties
- test/hotspot/jtreg/runtime/containers/docker/TestCPUAwareness.java
- test/hotspot/jtreg/runtime/containers/docker/TestCPUSets.java
- test/hotspot/jtreg/runtime/containers/docker/TestJFREvents.java
- test/hotspot/jtreg/runtime/containers/docker/TestMemoryAwareness.java
- test/hotspot/jtreg/runtime/containers/docker/TestMisc.java
- test/hotspot/jtreg/runtime/interpreter/WideStrictInline.java
- test/hotspot/jtreg/serviceability/dcmd/framework/TestJavaProcess.java
- test/jdk/sun/security/tools/jarsigner/AlgOptions.sh
- test/jdk/sun/security/tools/jarsigner/PercentSign.sh
- test/jdk/sun/security/tools/jarsigner/certpolicy.sh
- test/jdk/sun/security/tools/jarsigner/checkusage.sh
- test/jdk/sun/security/tools/jarsigner/collator.sh
- test/jdk/sun/security/tools/jarsigner/concise_jarsigner.sh
- test/jdk/sun/security/tools/jarsigner/crl.sh
- test/jdk/sun/security/tools/jarsigner/default_options.sh
- test/jdk/sun/security/tools/jarsigner/diffend.sh
- test/jdk/sun/security/tools/jarsigner/ec.sh
- test/jdk/sun/security/tools/jarsigner/emptymanifest.sh
- test/jdk/sun/security/tools/jarsigner/jvindex.sh
- test/jdk/sun/security/tools/jarsigner/nameclash.sh
- test/jdk/sun/security/tools/jarsigner/newsize7.sh
- test/jdk/sun/security/tools/jarsigner/oldsig.sh
- test/jdk/sun/security/tools/jarsigner/onlymanifest.sh
- test/jdk/sun/security/tools/jarsigner/passtype.sh
- test/jdk/sun/security/tools/jarsigner/samename.sh
- test/jdk/sun/security/tools/jarsigner/weaksize.sh
- test/jdk/sun/security/tools/keytool/CloneKeyAskPassword.sh
- test/jdk/sun/security/tools/keytool/NoExtNPE.sh
- test/jdk/sun/security/tools/keytool/SecretKeyKS.sh
- test/jdk/sun/security/tools/keytool/StandardAlgName.sh
- test/jdk/sun/security/tools/keytool/StorePasswordsByShell.sh
- test/jdk/sun/security/tools/keytool/default_options.sh
- test/jdk/sun/security/tools/keytool/emptysubject.sh
- test/jdk/sun/security/tools/keytool/file-in-help.sh
- test/jdk/sun/security/tools/keytool/i18n.sh
- test/jdk/sun/security/tools/keytool/importreadall.sh
- test/jdk/sun/security/tools/keytool/keyalg.sh
- test/jdk/sun/security/tools/keytool/newhelp.sh
- test/jdk/sun/security/tools/keytool/resource.sh
- test/jdk/sun/security/tools/keytool/selfissued.sh
- test/jdk/sun/security/tools/keytool/trystore.sh



More information about the amber-dev mailing list