Joakim Erdfelt 2da8c9c306 Merge branch 'master' into javawebsocket-jsr ...

Conflicts:
	jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java

2013-06-17 10:54:10 -07:00

..

test-continuation

fixed double dispatch in continuation tests

2013-06-11 10:50:15 +10:00

test-integration

[Bug 408600] set correct jetty.url in all pom files

2013-06-12 15:52:36 -05:00

test-loginservice

[Bug 408600] set correct jetty.url in all pom files

2013-06-12 15:52:36 -05:00

test-sessions

Merge remote-tracking branch 'origin/jetty-8'

2013-06-17 14:39:17 +10:00

test-webapps

Merge branch 'master' into javawebsocket-jsr

2013-06-17 10:54:10 -07:00

pom.xml

[Bug 408600] set correct jetty.url in all pom files

2013-06-12 15:52:36 -05:00