hg: jdk9/dev/jdk: 2 new changesets

[lana.steuck at oracle.com]

Changeset: 56379812ec5e
Author:    lana
Date:      2016-04-28 08:26 -0700
URL:       http://hg.openjdk.java.net/jdk9/dev/jdk/rev/56379812ec5e

Added tag jdk-9+116 for changeset baeb5edb3893

! .hgtags

Changeset: 3a56dfbc0748
Author:    lana
Date:      2016-04-28 09:38 -0700
URL:       http://hg.openjdk.java.net/jdk9/dev/jdk/rev/3a56dfbc0748

Merge

- make/launcher/Launcher-jdk.jvmstat.rmi.gmk
- src/java.base/share/classes/jdk/net/ExtendedSocketOptions.java
- src/java.base/share/classes/jdk/net/NetworkPermission.java
- src/java.base/share/classes/jdk/net/SocketFlow.java
- src/java.base/share/classes/jdk/net/Sockets.java
- src/java.base/share/classes/jdk/net/package-info.java
- src/java.base/share/classes/sun/net/ExtendedOptionsImpl.java
- src/java.base/unix/native/libnet/ExtendedOptionsImpl.c
- src/java.base/windows/native/libnet/ExtendedOptionsImpl.c
! src/java.rmi/share/classes/sun/rmi/transport/proxy/CGIHandler.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpAwareServerSocket.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpOutputStream.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpReceiveSocket.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendInputStream.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendOutputStream.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIDirectSocketFactory.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIHttpToCGISocketFactory.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/RMISocketInfo.java
! src/java.rmi/share/classes/sun/rmi/transport/proxy/WrappedSocket.java
- src/jdk.jvmstat.rmi/share/classes/module-info.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/monitor/remote/package.html
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostRmiService.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java
- src/jdk.jvmstat.rmi/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html
- src/jdk.jvmstat.rmi/share/classes/sun/tools/jstatd/Jstatd.java
- src/jdk.jvmstat.rmi/share/classes/sun/tools/jstatd/RemoteHostImpl.java
- src/jdk.jvmstat.rmi/share/classes/sun/tools/jstatd/RemoteVmImpl.java
! test/java/rmi/transport/httpSocket/HttpSocketTest.java
! test/java/rmi/transport/httpSocket/HttpSocketTest_Stub.java
! test/java/rmi/transport/httpSocket/security.policy
- test/sanity/client/lib/Jemmy2Ext/src/org/jemmy2ext/JemmyExt.java
! test/sun/rmi/transport/proxy/DisableHttpDefaultValue.java
! test/sun/rmi/transport/proxy/EagerHttpFallback.java
! test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java
! test/sun/rmi/transport/tcp/blockAccept/TestIface.java
! test/sun/rmi/transport/tcp/blockAccept/TestImpl.java
! test/sun/rmi/transport/tcp/blockAccept/TestImpl_Stub.java