You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/10/31 15:21:41 UTC
svn commit: r1767303 - in /qpid/java/branches/6.1.x: ./
broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
broker-plugins/management-http/src/main/java/resources/showBroker.html
Author: kwall
Date: Mon Oct 31 15:21:40 2016
New Revision: 1767303
URL: http://svn.apache.org/viewvc?rev=1767303&view=rev
Log:
QPID-7482: Fix screen labels for heartbeat delay
Merged from trunk with command:
svn merge -c 1767275 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/showBroker.html
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 31 15:21:40 2016
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766797,1766806,1767251
+/qpid/java/trunk:1766797,1766806,1767251,1767275
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1767303&r1=1767302&r2=1767303&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Mon Oct 31 15:21:40 2016
@@ -132,7 +132,9 @@ public interface Broker<X extends Broker
@ManagedAttribute( defaultValue = "256" )
int getConnection_sessionCountLimit();
- @ManagedAttribute( defaultValue = "0")
+ @ManagedAttribute( defaultValue = "0", description = "The default frequency with which Broker and client will exchange heartbeat messages (in seconds). "
+ + "Clients may negotiate a different heartbeat frequency or disable it altogether. "
+ + "A value of 0 disables heart beating.")
int getConnection_heartBeatDelay();
@ManagedAttribute( defaultValue = "true" )
Modified: qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/showBroker.html
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/showBroker.html?rev=1767303&r1=1767302&r2=1767303&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/showBroker.html (original)
+++ qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/showBroker.html Mon Oct 31 15:21:40 2016
@@ -61,7 +61,7 @@
<div id="brokerAttribute.connection.sessionCountLimit"></div>
</div>
<div id="brokerAttribute.connection.heartBeatDelay.container" class="clear">
- <div class="formLabel-labelCell">Heart beat delay (ms):</div>
+ <div class="formLabel-labelCell">Heart beat delay (s):</div>
<div id="brokerAttribute.connection.heartBeatDelay"></div>
</div>
<div class="clear"></div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org