hg: jdk/sandbox: 2 new changesets

[daniel.fuchs at oracle.com]

Changeset: d5703ecb5b0a
Author:    dfuchs
Date:      2018-04-09 14:27 +0100
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/d5703ecb5b0a

Merge

! make/common/Modules.gmk
- make/mapfiles/launchers/mapfile-ppc64
- make/mapfiles/launchers/mapfile-ppc64.anonymous
- make/mapfiles/launchers/mapfile-sparc
- make/mapfiles/launchers/mapfile-sparcv9
- make/mapfiles/launchers/mapfile-x86
- make/mapfiles/launchers/mapfile-x86.anonymous
- make/mapfiles/launchers/mapfile-x86_64
- make/mapfiles/launchers/mapfile-x86_64.anonymous
- make/mapfiles/libunpack/mapfile-vers-unpack200
- make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-sparc
- make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-x86
- make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous
! src/java.base/share/classes/java/net/doc-files/net-properties.html
- src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java
- test/jdk/java/lang/SecurityManager/DepMethodsRequireAllPerm.java
- test/jdk/java/nio/channels/SocketChannel/IsConnectable.java
- test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.sh
- test/jdk/sun/security/mscapi/KeytoolChangeAlias.sh
- test/jdk/sun/security/mscapi/PublicKeyInterop.sh
- test/jdk/sun/security/mscapi/RSAEncryptDecrypt.sh
- test/jdk/sun/security/mscapi/ShortRSAKey1024.sh
- test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.sh
- test/jdk/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.sh
- test/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.java
- test/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.out
- test/tools/javac/importChecks/ImportCanonicalSameName/p1/A.java
- test/tools/javac/importChecks/ImportCanonicalSameName/p2/A.java

Changeset: f14bec8e8d8e
Author:    dfuchs
Date:      2018-04-09 15:28 +0100
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/f14bec8e8d8e

Merge

- make/mapfiles/launchers/mapfile-ppc64
- make/mapfiles/launchers/mapfile-ppc64.anonymous
- make/mapfiles/launchers/mapfile-sparc
- make/mapfiles/launchers/mapfile-sparcv9
- make/mapfiles/launchers/mapfile-x86
- make/mapfiles/launchers/mapfile-x86.anonymous
- make/mapfiles/launchers/mapfile-x86_64
- make/mapfiles/launchers/mapfile-x86_64.anonymous
- make/mapfiles/libunpack/mapfile-vers-unpack200
- make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-sparc
- make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-x86
- make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous
- src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java
- test/jdk/java/lang/SecurityManager/DepMethodsRequireAllPerm.java
- test/jdk/java/nio/channels/SocketChannel/IsConnectable.java
- test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.sh
- test/jdk/sun/security/mscapi/KeytoolChangeAlias.sh
- test/jdk/sun/security/mscapi/PublicKeyInterop.sh
- test/jdk/sun/security/mscapi/RSAEncryptDecrypt.sh
- test/jdk/sun/security/mscapi/ShortRSAKey1024.sh
- test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.sh
- test/jdk/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.sh
- test/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.java
- test/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.out
- test/tools/javac/importChecks/ImportCanonicalSameName/p1/A.java
- test/tools/javac/importChecks/ImportCanonicalSameName/p2/A.java