Joakim Erdfelt 554fc39f06 Merge branch `jetty-9.2.x` into `jetty-9.3.x` ... Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java # jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java # jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java # jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java # jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java # jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java # jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java # jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java # jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java		2019-04-03 17:19:34 -05:00
..
src	Merge branch `jetty-9.2.x` into `jetty-9.3.x`	2019-04-03 17:19:34 -05:00
.gitignore	Adding tests for Named Logging	2011-08-24 09:31:28 -07:00
pom.xml	Updating to version 9.3.27-SNAPSHOT	2019-04-03 17:32:08 +11:00