hg: jdk9/sandbox/jdk: Merge

stuart.marks at oracle.com stuart.marks at oracle.com
Tue Dec 8 21:49:01 UTC 2015


Changeset: 62088d91a3af
Author:    smarks
Date:      2015-12-08 13:48 -0800
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/62088d91a3af

Merge

- make/launcher/Launcher-jdk.jvmstat.gmk
! src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java
- src/java.base/share/classes/sun/misc/Contended.java
- src/java.base/share/native/libzip/ZipFile.c
- src/java.base/unix/classes/sun/nio/ch/DefaultSelectorProvider.java
- src/java.desktop/share/classes/sun/swing/plaf/synth/SynthIcon.java
- src/jdk.deploy.osx/macosx/classes/apple/applescript/AppleScriptEngine.java
- src/jdk.deploy.osx/macosx/classes/apple/applescript/AppleScriptEngineFactory.java
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AS_NS_ConversionUtils.h
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AS_NS_ConversionUtils.m
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptEngine.m
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptExecutionContext.h
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/AppleScriptExecutionContext.m
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/NS_Java_ConversionUtils.h
- src/jdk.deploy.osx/macosx/native/libapplescriptengine/NS_Java_ConversionUtils.m
- src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/remote/package.html
- src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostRmiService.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java
- src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html
- src/jdk.jvmstat/share/classes/sun/tools/jstatd/Jstatd.java
- src/jdk.jvmstat/share/classes/sun/tools/jstatd/RemoteHostImpl.java
- src/jdk.jvmstat/share/classes/sun/tools/jstatd/RemoteVmImpl.java
! test/TEST.groups
- test/javax/sound/sampled/FileReader/AudioFileClose.java
- test/javax/sound/sampled/FileReader/ReadersExceptions.java
- test/javax/sound/sampled/FileReader/RepeatedFormatReader.java
- test/javax/sound/sampled/FileWriter/AlawEncoderSync.java
- test/javax/sound/sampled/FileWriter/WriterCloseInput.java
- test/lib/testlibrary/jdk/testlibrary/InputArguments.java
- test/sun/security/tools/jarsigner/warning.sh



More information about the jdk9-sandbox-changes mailing list