hg: jdk9/sandbox/jdk: 2 new changesets

[pavel.rappo at oracle.com]

Changeset: aded2ee33b93
Author:    prappo
Date:      2016-04-22 13:39 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/aded2ee33b93

JEP-110-branch: WebSocket: Test fix (was failing because of a security manager installed by some other test)

! test/java/net/httpclient/BasicWebSocketAPITest.java

Changeset: c94032b14995
Author:    prappo
Date:      2016-04-22 14:02 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/c94032b14995

JEP-110-branch: WebSocket: local merge + fixing an accidental push of X-Buffer.java.template

! src/java.base/share/classes/java/nio/X-Buffer.java.template
- test/java/net/httpclient/http2/java.httpclient/java/net/http/Queue.java
- test/java/net/httpclient/http2/java/net/http/Http2TestExchange.java
- test/java/net/httpclient/http2/java/net/http/Http2TestServer.java
- test/java/net/httpclient/http2/java/net/http/Http2TestServerConnection.java
- test/java/net/httpclient/http2/java/net/http/TestUtil.java