summaryrefslogtreecommitdiff
path: root/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
commit3bd3c535c3057533171dc9536b0a012017ad4a92 (patch)
tree94b940b35178ec8d1cec63552a32dab7aa3b0deb /java/test-profiles
parenteca5315ef57dd0a3abba05f549eb277db6357ae7 (diff)
downloadqpid-python-3bd3c535c3057533171dc9536b0a012017ad4a92.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/qpid@1481331 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/test-profiles')
-rwxr-xr-xjava/test-profiles/CPPExcludes2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/test-profiles/CPPExcludes b/java/test-profiles/CPPExcludes
index b429305572..a404ff4389 100755
--- a/java/test-profiles/CPPExcludes
+++ b/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