summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2014-08-15 12:00:39 +0000
committerAlan Conway <aconway@apache.org>2014-08-15 12:00:39 +0000
commite00bc2139c51b430277c95a7f0c8680f50c070ec (patch)
treeed3d3b865d304c380fda79f43429584cb86ff9de /qpid/cpp/src
parenta510c8d1ecb2b5ac02bd64d202b4fbe2a5fbdac2 (diff)
downloadqpid-python-e00bc2139c51b430277c95a7f0c8680f50c070ec.tar.gz
NO-JIRA: HA documentation improvements.
The broker options link-maintenance-interval and link-heartbeat-interval were documented only in the HA section and not in the federation section which created confusion about whether they affected HA links only or user federation links as well. Added documentation to the federation section and an explicit mention in the HA section that it uses federation links. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1618160 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/broker/Broker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp
index f244c9852c..f0d4e56ea7 100644
--- a/qpid/cpp/src/qpid/broker/Broker.cpp
+++ b/qpid/cpp/src/qpid/broker/Broker.cpp
@@ -190,7 +190,7 @@ BrokerOptions::BrokerOptions(const std::string& name) :
("default-message-group", optValue(defaultMsgGroup, "GROUP-IDENTIFER"), "Group identifier to assign to messages delivered to a message group queue that do not contain an identifier.")
("enable-timestamp", optValue(timestampRcvMsgs, "yes|no"), "Add current time to each received message.")
("link-maintenance-interval", optValue(linkMaintenanceInterval, "SECONDS"),
- "Interval to check link health and re-connect if need be")
+ "Interval to check federation link health and re-connect if need be")
("link-heartbeat-interval", optValue(linkHeartbeatInterval, "SECONDS"),
"Heartbeat interval for a federation link")
("dtx-default-timeout", optValue(dtxDefaultTimeout, "SECONDS"), "Default timeout for DTX transaction before aborting it")