Joakim Erdfelt 130afb9535 Merge branch 'jetty-9.2.x' ... Conflicts: jetty-client/src/main/java/org/eclipse/jetty/client/LeakTrackingConnectionPool.java jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientLoadTest.java jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientUploadDuringServerShutdown.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SynDataReplyDataLoadTest.java jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/TooFastClientTest.java		2015-03-06 15:57:52 -07:00
..
src	Merge branch 'jetty-9.2.x'	2015-03-06 15:57:52 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2015-02-24 10:38:33 -06:00