jetty.project/examples
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
..
async-rest [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00
embedded Merge remote-tracking branch 'origin/jetty-8' 2013-03-18 11:09:13 +11:00
pom.xml [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00