Repository: qpid-jms Updated Branches: refs/heads/master 8b9ab1491 -> e6dfc7419
QPIDJMS-78: document the clients supported SASL mechanisms, aid using the related config option Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/3484a283 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/3484a283 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/3484a283 Branch: refs/heads/master Commit: 3484a2835f1e052ea713d0e86ce19f80edb8b413 Parents: 8b9ab14 Author: Robert Gemmell <rob...@apache.org> Authored: Wed Jun 24 16:12:26 2015 +0100 Committer: Robert Gemmell <rob...@apache.org> Committed: Wed Jun 24 16:12:26 2015 +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/3484a283/qpid-jms-docs/Configuration.md ---------------------------------------------------------------------- diff --git a/qpid-jms-docs/Configuration.md b/qpid-jms-docs/Configuration.md index f14b5e0..8ddd253 100644 --- a/qpid-jms-docs/Configuration.md +++ b/qpid-jms-docs/Configuration.md @@ -172,7 +172,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, comma separated. Default is no restriction. ++ **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. ### Discovery Configuration options --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
