Repository: qpid-jms
Updated Branches:
  refs/heads/master 1f764abed -> 7f683f5f4


QPIDJMS-68, QPIDJMS-69: document the new options


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

Branch: refs/heads/master
Commit: 7f683f5f4b1aeb385b7cff4f96a64ab6fa36abbe
Parents: 1f764ab
Author: Robert Gemmell <[email protected]>
Authored: Mon Jun 15 16:33:36 2015 +0100
Committer: Robert Gemmell <[email protected]>
Committed: Mon Jun 15 16:33:36 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/7f683f5f/qpid-jms-docs/Configuration.md
----------------------------------------------------------------------
diff --git a/qpid-jms-docs/Configuration.md b/qpid-jms-docs/Configuration.md
index d9e777e..f14b5e0 100644
--- a/qpid-jms-docs/Configuration.md
+++ b/qpid-jms-docs/Configuration.md
@@ -171,6 +171,8 @@ 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.
 
 
 ### Discovery Configuration options


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to