You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2016/04/01 13:17:38 UTC

qpid-jms git commit: QPIDJMS-150: update the config docs to include the new mechanisms

Repository: qpid-jms
Updated Branches:
  refs/heads/master f187587d3 -> de9539de3


QPIDJMS-150: update the config docs to include the new mechanisms


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/de9539de
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/de9539de
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/de9539de

Branch: refs/heads/master
Commit: de9539de3f8c5bc8dfa31adebd2d891419a47650
Parents: f187587
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Apr 1 12:17:05 2016 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Apr 1 12:17:05 2016 +0100

----------------------------------------------------------------------
 qpid-jms-docs/Configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/de9539de/qpid-jms-docs/Configuration.md
----------------------------------------------------------------------
diff --git a/qpid-jms-docs/Configuration.md b/qpid-jms-docs/Configuration.md
index af8385d..a9002bf 100644
--- a/qpid-jms-docs/Configuration.md
+++ b/qpid-jms-docs/Configuration.md
@@ -162,7 +162,7 @@ These options apply to the behaviour of certain AMQP functionality.
 + **amqp.idleTimeout** The idle timeout in milliseconds after which the connection will be failed if the peer sends no AMQP frames. Default is 60000.
 + **amqp.vhost** The vhost to connect to. Used to populate the Sasl and Open hostname fields. Default is the main hostname from the Connection URI.
 + **amqp.saslLayer** Controls whether connections should use a SASL layer or not. Default is true.
-+ **amqp.saslMechanisms** Which SASL mechanism(s) the client should allow selection of, if offered by the server and usable with the configured credentials. Comma separated if specifying more than 1 mechanism. Default is to allow selection from all the clients supported mechanisms, which are currently EXTERNAL, CRAM-MD5, PLAIN, and ANONYMOUS.
++ **amqp.saslMechanisms** Which SASL mechanism(s) the client should allow selection of, if offered by the server and usable with the configured credentials. Comma separated if specifying more than 1 mechanism. Default is to allow selection from all the clients supported mechanisms, which are currently EXTERNAL, SCRAM-SHA-256, SCRAM-SHA-1, CRAM-MD5, PLAIN, and ANONYMOUS.
 + **amqp.maxFrameSize** The max-frame-size value in bytes that is advertised to the peer. Default is 1048576.
 
 ### Failover Configuration options


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org