Joakim Erdfelt 60d8661890 Merge `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/Http2Server.java # jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebInfConfiguration.java # jetty-http/src/test/java/org/eclipse/jetty/http/QuotedCSVTest.java # jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java # jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java # jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java # jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java # jetty-util/src/test/java/org/eclipse/jetty/util/StringUtilTest.java # jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java # jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java # tests/test-integration/src/test/java/org/eclipse/jetty/test/support/XmlBasedJettyServer.java		2019-06-13 14:14:42 -05:00
..
src	Merge `jetty-9.4.x` into `jetty-10.0.x`	2019-06-13 14:14:42 -05:00
pom.xml	Updating to version 9.4.20-SNAPSHOT	2019-06-10 13:40:17 -05:00