You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/03/03 12:13:25 UTC
svn commit: r1785279 - in /qpid/java/branches/6.1.x: ./
bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
Author: orudyy
Date: Fri Mar 3 12:13:24 2017
New Revision: 1785279
URL: http://svn.apache.org/viewvc?rev=1785279&view=rev
Log:
QPID-7631: Enable changing of BDB HA node priority regadless the size of the group
svn merge -c 1785117 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
qpid/java/branches/6.1.x/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 3 12:13:24 2017
@@ -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:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735,1785117
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js?rev=1785279&r1=1785278&r2=1785279&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js (original)
+++ qpid/java/branches/6.1.x/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js Fri Mar 3 12:13:24 2017
@@ -58,8 +58,6 @@ define(["qpid/common/util",
{
registry.byId("editVirtualHostNode.designatedPrimary")
.set("disabled", true);
- registry.byId("editVirtualHostNode.priority")
- .set("disabled", false);
registry.byId("editVirtualHostNode.quorumOverride")
.set("disabled", false);
var overrideLimit = Math.floor((node.remotereplicationnodes.length + 1) / 2);
@@ -75,8 +73,6 @@ define(["qpid/common/util",
{
registry.byId("editVirtualHostNode.designatedPrimary")
.set("disabled", false);
- registry.byId("editVirtualHostNode.priority")
- .set("disabled", true);
registry.byId("editVirtualHostNode.quorumOverride")
.set("disabled", true);
}
Modified: qpid/java/branches/6.1.x/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js?rev=1785279&r1=1785278&r2=1785279&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js (original)
+++ qpid/java/branches/6.1.x/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js Fri Mar 3 12:13:24 2017
@@ -215,13 +215,11 @@ define(["dojo/_base/connect",
if (!members || members.length < 3)
{
this.designatedPrimaryContainer.style.display = "block";
- this.priorityContainer.style.display = "none";
this.quorumOverrideContainer.style.display = "none";
}
else
{
this.designatedPrimaryContainer.style.display = "none";
- this.priorityContainer.style.display = "block";
this.quorumOverrideContainer.style.display = "block";
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org