Greg Wilkins e8d76ef12c Merge remote-tracking branch 'origin/jetty-8' ... 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		2013-03-18 11:09:13 +11:00
..
assembly	updating to parent-17-snapshot and various changes to work with updated maven plugins	2011-05-17 13:41:15 +00:00
resources	Merge remote-tracking branch 'origin/jetty-8'	2013-03-18 11:09:13 +11:00