hg: jdk9/sandbox/jdk: Merge

aleksey.shipilev at oracle.com aleksey.shipilev at oracle.com
Mon Nov 30 15:31:14 UTC 2015


Changeset: f257983f5fdf
Author:    shade
Date:      2015-11-30 18:30 +0300
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/f257983f5fdf

Merge

- make/launcher/Launcher-jdk.jvmstat.gmk
! src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
! src/java.base/share/classes/java/lang/invoke/Invokers.java
! src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/util/Arrays.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
! src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
- src/java.base/share/classes/sun/util/logging/LoggingProxy.java
- src/java.base/share/classes/sun/util/logging/LoggingSupport.java
! src/java.desktop/share/native/libfontmanager/freetypeScaler.c
- src/java.logging/share/classes/java/util/logging/LoggingProxyImpl.java
- 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/lib/testlibrary/jdk/testlibrary/InputArguments.java



More information about the jdk9-sandbox-changes mailing list