Joakim Erdfelt 3ee665700d Merge branch `jetty-9.4.x` into `jetty-10.0.x` ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java # jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java # jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedEventDriver.java # jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyListenerEventDriver.java		2019-08-07 05:28:06 -05:00
..
src/test	Merge branch `jetty-9.4.x` into `jetty-10.0.x`	2019-08-07 05:28:06 -05:00
pom.xml	Updating to version 10.0.0-SNAPSHOT	2019-07-12 06:54:56 +10:00