summaryrefslogtreecommitdiff
path: root/qpid/java/test-profiles
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2013-05-11 14:27:01 +0000
committerRobert Godfrey <rgodfrey@apache.org>2013-05-11 14:27:01 +0000
commit64db4df9cbd3c88b103f43b8860efb3c2b9e2791 (patch)
treecef2834cb93d38757c2705cfe8e4edc977a89760 /qpid/java/test-profiles
parent0b22baa11318fc7e86c9d1b9b74ad3d83e276859 (diff)
downloadqpid-python-64db4df9cbd3c88b103f43b8860efb3c2b9e2791.tar.gz
QPID-4831 : [Java Broker] Allow SSL and non-SSL connections on the same port
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1481331 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/test-profiles')
-rwxr-xr-xqpid/java/test-profiles/CPPExcludes2
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/java/test-profiles/CPPExcludes b/qpid/java/test-profiles/CPPExcludes
index b429305572..a404ff4389 100755
--- a/qpid/java/test-profiles/CPPExcludes
+++ b/qpid/java/test-profiles/CPPExcludes
@@ -180,6 +180,8 @@ org.apache.qpid.client.failover.MultipleBrokersFailoverTest#*
// Uses Java broker specific configuration
org.apache.qpid.client.ssl.SSLTest#testClientCertMissingWhilstWanting
+org.apache.qpid.client.ssl.SSLTest#testCreateSSLandTCPonSamePort
+
// QPID-2796 : Java 0-10 client only sends heartbeats in response to heartbeats from the server, not timeout based
org.apache.qpid.client.HeartbeatTest#testReadOnlyConnectionHeartbeats