hg: jdk/sandbox: 2 new changesets

[andy.herrick at oracle.com]

Changeset: 06bc4bd64599
Author:    herrick
Date:      2018-12-21 07:40 -0500
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/06bc4bd64599

8215515: Add a command line option to override internal resources.
Reviewed-by: kcr, almatvee

! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.java
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/javalogo_white_16.png
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/javalogo_white_48.png
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/ResourceLocator.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsBundlerParam.java
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.java
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/javalogo_white_16.ico
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/javalogo_white_32.ico

Changeset: 3c5666ad2181
Author:    herrick
Date:      2018-12-21 07:46 -0500
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/3c5666ad2181

Merge

- src/hotspot/share/runtime/arguments_ext.hpp
- src/hotspot/share/services/diagnosticCommand_ext.hpp
- test/jdk/java/net/MulticastSocket/PromiscuousIPv6.java
- test/jdk/java/nio/channels/DatagramChannel/PromiscuousIPv6.java