Joakim Erdfelt 343aa066ae Merge branch 'jetty-9.2.x' into jetty-9.3.x ... Conflicts: jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/WarPluginInfo.java jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/Main.java jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java jetty-util/src/test/java/org/eclipse/jetty/util/IncludeExcludeTest.java jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java		2015-12-16 12:56:13 -07:00
..
src	Merge branch 'jetty-9.2.x' into jetty-9.3.x	2015-12-16 12:56:13 -07:00
pom.xml	Updating to version 9.3.7-SNAPSHOT	2015-11-06 12:13:00 -07:00