diff options
author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-25 15:28:50 +0000 |
---|---|---|
committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-25 15:28:50 +0000 |
commit | 9556a8d9c53be396a25cd4c29842b79e99bc1746 (patch) | |
tree | bf6f92cfaee1883199c743bd25359841af3e7f1b /qpid/java/systests/etc/config-systests.json | |
parent | 19478e74524f27e26f01117b1b973829718ed44d (diff) | |
download | qpid-python-9556a8d9c53be396a25cd4c29842b79e99bc1746.tar.gz |
Merging from trunk r1618473:1618815 in the Java tree
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620348 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/etc/config-systests.json')
-rw-r--r-- | qpid/java/systests/etc/config-systests.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/java/systests/etc/config-systests.json b/qpid/java/systests/etc/config-systests.json index 4375f258e8..4ec402c292 100644 --- a/qpid/java/systests/etc/config-systests.json +++ b/qpid/java/systests/etc/config-systests.json @@ -41,7 +41,8 @@ "ports" : [ { "name" : "amqp", "authenticationProvider" : "plain", - "port" : "${test.port}" + "port" : "${test.port}", + "protocols" : "${test.amqp_port_protocols}" }, { "name" : "http", "authenticationProvider" : "plain", |