hg: amber/amber: Automatic merge with default
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Thu Apr 19 20:06:01 UTC 2018
Changeset: 460a2146279e
Author: mcimadamore
Date: 2018-04-19 22:06 +0200
URL: http://hg.openjdk.java.net/amber/amber/rev/460a2146279e
Automatic merge with default
- src/hotspot/share/gc/cms/vmStructs_parNew.hpp
- src/hotspot/share/gc/g1/concurrentMarkThread.cpp
- src/hotspot/share/gc/g1/concurrentMarkThread.hpp
- src/hotspot/share/gc/g1/concurrentMarkThread.inline.hpp
- src/hotspot/share/gc/g1/g1CardLiveData.cpp
- src/hotspot/share/gc/g1/g1CardLiveData.hpp
- src/hotspot/share/gc/g1/g1CardLiveData.inline.hpp
- src/hotspot/share/gc/g1/g1_globals.cpp
- src/hotspot/share/memory/binaryTreeDictionary.cpp
- src/hotspot/share/memory/freeList.cpp
- src/hotspot/share/runtime/commandLineFlagConstraintsGC.cpp
- src/hotspot/share/runtime/commandLineFlagConstraintsGC.hpp
- src/java.base/share/classes/com/sun/crypto/provider/ai.java
- src/java.base/share/classes/jdk/internal/misc/JavaSecurityProtectionDomainAccess.java
- src/java.base/windows/classes/java/net/TwoStacksPlainSocketImpl.java
- src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c
- src/java.desktop/share/classes/com/sun/awt/AWTUtilities.java
- src/java.security.jgss/unix/native/libj2gss/NativeFunc.c
- src/java.security.jgss/unix/native/libj2gss/NativeFunc.h
- src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractAsyncSSLConnection.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractSubscription.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncEvent.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLConnection.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLTunnelConnection.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncTriggerEvent.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AuthenticationFilter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BufferingSubscriber.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ConnectionPool.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/CookieFilter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Exchange.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExchangeImpl.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/FilterFactory.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderFilter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderParser.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1AsyncReceiver.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Exchange.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1HeaderParser.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Request.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Response.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2ClientImpl.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClient.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientBuilderImpl.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientFacade.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientImpl.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpConnection.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpHeaders.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestBuilderImpl.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestImpl.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponseImpl.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpTimeoutException.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ImmutableHeaders.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiExchange.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiMapResult.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainHttpConnection.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainProxyConnection.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainTunnelingConnection.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PrivilegedExecutor.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PullPublisher.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushGroup.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RawChannelImpl.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RedirectFilter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestPublishers.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Response.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseContent.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseSubscribers.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLDelegate.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SocketTube.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Stream.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/TimeoutEvent.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocket.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocketHandshakeException.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowController.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowUpdateSender.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferPool.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferReference.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ConnectionExpiredException.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/DebugLogger.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Demand.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/FlowTube.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/HttpHeadersImpl.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Log.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/MinimalFuture.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Pair.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SSLFlowDelegate.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SSLTube.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SequentialScheduler.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SubscriberWrapper.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SubscriptionBase.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Utils.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ContinuationFrame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/DataFrame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ErrorFrame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesDecoder.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesEncoder.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/GoAwayFrame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeaderFrame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeadersFrame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/Http2Frame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/MalformedFrame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/OutgoingHeaders.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PingFrame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PriorityFrame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PushPromiseFrame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ResetFrame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/SettingsFrame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/WindowUpdateFrame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BinaryRepresentationWriter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BulkSizeUpdateWriter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Decoder.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/DecodingCallback.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Encoder.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HPACK.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HeaderTable.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Huffman.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/ISO_8859_1.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexNameValueWriter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexedWriter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerReader.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerWriter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralNeverIndexedWriter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWithIndexingWriter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWriter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/SizeUpdateWriter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringReader.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringWriter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/package-info.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/BuilderImpl.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CheckFailedException.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FailWebSocketException.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Frame.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FrameConsumer.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/MessageStreamConsumer.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OpeningHandshake.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OutgoingMessage.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/RawChannel.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Receiver.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/StatusCodes.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Transmitter.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/TransportSupplier.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/UTF8AccumulatingDecoder.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketImpl.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketRequest.java
- src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/package-info.java
- src/jdk.incubator.httpclient/share/classes/module-info.java
- src/jdk.internal.vm.compiler.management/share/classes/org/graalvm/compiler/hotspot/jmx/GraalMBeans.java
- test/hotspot/jtreg/runtime/6626217/Test6626217.sh
- test/hotspot/jtreg/runtime/6626217/many_loader1.java.foo
- test/hotspot/jtreg/runtime/6626217/many_loader2.java.foo
- test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BinaryPrimitivesTest.java
- test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BuffersTestingKit.java
- test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/CircularBufferTest.java
- test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/DecoderTest.java
- test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/EncoderTest.java
- test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HeaderTableTest.java
- test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HuffmanTest.java
- test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/SpecHelper.java
- test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/TestHelper.java
- test/jdk/java/net/httpclient/security/filePerms/httpclient.policy
- test/jdk/java/net/httpclient/websocket/BuildingWebSocketDriver.java
- test/jdk/java/net/httpclient/websocket/ConnectionHandover.java
- test/jdk/java/net/httpclient/websocket/ReceivingTestDriver.java
- test/jdk/java/net/httpclient/websocket/SendingTestDriver.java
- test/jdk/java/net/httpclient/websocket/WSHandshakeException.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/BuildingWebSocketTest.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/HeaderWriterTest.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MaskerTest.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListener.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockReceiver.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockTransmitter.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockTransport.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReaderTest.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReceivingTest.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/SendingTest.java
- test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/TestSupport.java
- test/jdk/java/net/httpclient/whitebox/Driver.java
- test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/AbstractRandomTest.java
- test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/AbstractSSLTubeTest.java
- test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ConnectionPoolTest.java
- test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/FlowTest.java
- test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/Http1HeaderParserTest.java
- test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/RawChannelTest.java
- test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SSLEchoTubeTest.java
- test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SSLTubeTest.java
- test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SelectorTest.java
- test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/WrapperTest.java
- test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/internal/common/DemandTest.java
- test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/internal/frame/FramesDecoderTest.java
- test/langtools/tools/javac/6410653/T6410653.java
- test/langtools/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java
- test/langtools/tools/javac/diags/examples/PreviewPlural/Bar.java
- test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/Bar.java
- test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java
- test/langtools/tools/javac/options/release/ReleaseOptionClashes.java
More information about the amber-dev
mailing list