mirror of
https://github.com/jetty/jetty.project.git
synced 2025-02-23 16:05:00 +00:00
e8d76ef12c
Conflicts: examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java jetty-io/src/test/java/org/eclipse/jetty/io/ThreadLocalBuffersTest.java jetty-server/src/main/config/etc/jetty-requestlog.xml jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java jetty-servlets/pom.xml