Joakim Erdfelt c30c8d4339 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-client/pom.xml # jetty-http/pom.xml # jetty-http2/http2-client/pom.xml # jetty-http2/http2-http-client-transport/pom.xml # jetty-http2/http2-server/pom.xml # jetty-osgi/test-jetty-osgi/pom.xml # jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml # jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml # jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java # jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java # jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java # jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java # jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java # jetty-quickstart/pom.xml # jetty-servlets/pom.xml # jetty-util/pom.xml # jetty-websocket/javax-websocket-client/pom.xml # jetty-websocket/javax-websocket-server/pom.xml # jetty-websocket/jetty-websocket-server/pom.xml # pom.xml		2019-01-30 11:56:58 -06:00
..
src	Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api	2019-01-30 11:56:58 -06:00
pom.xml	Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api	2019-01-30 11:56:58 -06:00