Joakim Erdfelt 95a6b76851 Merge branch `jetty-9.4.x` into `jetty-10.0.x` ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java # jetty-osgi/test-jetty-osgi/pom.xml # jetty-server/src/main/java/org/eclipse/jetty/server/Server.java # jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java		2019-03-15 16:00:59 -05:00
..
src	Merge branch `jetty-9.4.x` into `jetty-10.0.x`	2019-03-15 16:00:59 -05:00
.gitignore	Adding tests for Named Logging	2011-08-24 09:31:28 -07:00
pom.xml	Removing no longer used jetty-servlet-api from jetty-util	2019-02-27 09:29:06 -05:00