Joakim Erdfelt 1edff35676 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/client/ClientConnectTest.java # jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java		2019-11-13 10:58:48 -06:00
..
java/org/eclipse/jetty/websocket/tests	Merge branch 'jetty-9.4.x' into jetty-10.0.x	2019-11-13 10:58:48 -06:00
resources	fix logging defaults to INFO	2019-10-16 13:53:57 +11:00