Joakim Erdfelt 3544283865 Merge branch `jetty-9.4.x` into `jetty-10.0.x` ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # Jenkinsfile # jetty-server/src/test/java/org/eclipse/jetty/server/ForwardedRequestCustomizerTest.java # jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java # jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/ReadState.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ReadStateTest.java # tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java		2019-08-14 09:39:06 -05:00
..
src/main	Merge branch `jetty-9.4.x` into `jetty-10.0.x`	2019-08-14 09:39:06 -05:00
pom.xml	Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.	2019-08-10 00:39:54 +02:00