Joakim Erdfelt 81d32f64f0 Merge remote-tracking branch 'origin/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/EventSocket.java # jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketUpgradeRequest.java # jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java		2020-01-15 11:44:43 -06:00
..
src/test	Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x	2020-01-15 11:44:43 -06:00
fuzzingclient.json	Rename websocket modules and directories with new naming convention.	2019-12-20 15:41:55 +11:00
fuzzingserver.json	Rename websocket modules and directories with new naming convention.	2019-12-20 15:41:55 +11:00
pom.xml	Update websocket artifact IDs	2019-12-23 13:32:21 +11:00