hg: jdk/sandbox: 2 new changesets

[andy.herrick at oracle.com]

Changeset: 044e7a644ee3
Author:    herrick
Date:      2018-12-06 16:45 -0500
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/044e7a644ee3

8214575: Exe installers will install application to already existing instalation
Submitten-by: almatvee
Reviewed-by: herrick. kcr

! src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.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/resources/template.iss
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/template.jre.iss

Changeset: 1fa5c73d3c5a
Author:    herrick
Date:      2018-12-07 09:46 -0500
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/1fa5c73d3c5a

Merge

- src/hotspot/share/gc/cms/vmCMSOperations.cpp
- src/hotspot/share/gc/cms/vmCMSOperations.hpp
- src/hotspot/share/gc/g1/vm_operations_g1.cpp
- src/hotspot/share/gc/g1/vm_operations_g1.hpp
- src/hotspot/share/gc/parallel/vmPSOperations.cpp
- src/hotspot/share/gc/parallel/vmPSOperations.hpp
- src/hotspot/share/gc/shared/vmGCOperations.cpp
- src/hotspot/share/gc/shared/vmGCOperations.hpp
- src/hotspot/share/runtime/vm_operations.cpp
- src/hotspot/share/runtime/vm_operations.hpp
- src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM964.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/TEST.properties
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/network001.java
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/network002.java
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/network003.java
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/network004.java
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/network005.java
- test/hotspot/jtreg/vmTestbase/nsk/stress/network/network006.java
- test/jdk/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh
- test/jdk/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz
- test/jdk/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz.sha256