Merge branch 'master' into jetty-9.1

2013-09-30 20:00:26 -07:00 · 2013-09-30 20:00:26 -07:00 · 499d811ba7
parent 2d7f1a2272 1315096192
commit 499d811ba7
1 changed files with 1 additions and 0 deletions
--- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/SSLExternalServerTest.java
+++ b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/SSLExternalServerTest.java
@ -41,6 +41,7 @@ import org.junit.Assume;
 import org.junit.Ignore;
 import org.junit.Test;

+@Ignore("Reliance on external server fails test")
 public class SSLExternalServerTest extends AbstractHTTPSPDYTest
 {
    public SSLExternalServerTest(short version)