jetty.project/jetty-spdy
Greg Wilkins e1cc5fb487 Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java
	jetty-util/src/main/java/org/eclipse/jetty/util/thread/NonBlockingThread.java
2015-01-08 15:21:01 +01:00
..
spdy-alpn-tests Happy New Year 2015 2015-01-07 17:06:59 -07:00
spdy-client Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk 2015-01-08 15:21:01 +01:00
spdy-core Happy New Year 2015 2015-01-07 17:06:59 -07:00
spdy-example-webapp [maven-release-plugin] prepare for next development iteration 2014-12-05 16:45:12 +01:00
spdy-http-client-transport Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk 2015-01-08 15:21:01 +01:00
spdy-http-common Happy New Year 2015 2015-01-07 17:06:59 -07:00
spdy-http-server Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk 2015-01-08 15:21:01 +01:00
spdy-npn-tests Happy New Year 2015 2015-01-07 17:06:59 -07:00
spdy-server Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk 2015-01-08 15:21:01 +01:00
pom.xml [maven-release-plugin] prepare for next development iteration 2014-12-05 16:45:12 +01:00