You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ki...@apache.org on 2015/06/15 16:27:36 UTC
[1/3] storm git commit: STORM-860 "Activate" only makes sense while
inactivated
Repository: storm
Updated Branches:
refs/heads/master 247e149aa -> f75cf7c17
STORM-860 "Activate" only makes sense while inactivated
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/55c3f90a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/55c3f90a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/55c3f90a
Branch: refs/heads/master
Commit: 55c3f90a6b7bd1df4e1196c9cbf673b267e8df87
Parents: 58372f0
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Jun 11 06:04:34 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Jun 11 06:04:34 2015 +0900
----------------------------------------------------------------------
storm-core/src/ui/public/js/script.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/55c3f90a/storm-core/src/ui/public/js/script.js
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/js/script.js b/storm-core/src/ui/public/js/script.js
index 56e5cc4..abd66c1 100644
--- a/storm-core/src/ui/public/js/script.js
+++ b/storm-core/src/ui/public/js/script.js
@@ -152,7 +152,7 @@ function topologyActionJson(id, encodedId, name,status,msgTimeout) {
jsonData["encodedId"] = encodedId;
jsonData["name"] = name;
jsonData["msgTimeout"] = msgTimeout;
- jsonData["activateStatus"] = (status === "ACTIVE") ? "disabled" : "enabled";
+ jsonData["activateStatus"] = (status === "INACTIVE") ? "enabled" : "disabled";
jsonData["deactivateStatus"] = (status === "ACTIVE") ? "enabled" : "disabled";
jsonData["rebalanceStatus"] = (status === "ACTIVE" || status === "INACTIVE" ) ? "enabled" : "disabled";
jsonData["killStatus"] = (status !== "KILLED") ? "enabled" : "disabled";
[2/3] storm git commit: Merge branch 'STORM-860' of
https://github.com/HeartSaVioR/storm
Posted by ki...@apache.org.
Merge branch 'STORM-860' of https://github.com/HeartSaVioR/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/df8baad4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/df8baad4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/df8baad4
Branch: refs/heads/master
Commit: df8baad4a137cf9a022744aa66cbabf353bf0db1
Parents: 247e149 55c3f90
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Mon Jun 15 09:26:25 2015 -0500
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Mon Jun 15 09:26:25 2015 -0500
----------------------------------------------------------------------
storm-core/src/ui/public/js/script.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] storm git commit: Add STORM-860 to Changelog
Posted by ki...@apache.org.
Add STORM-860 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f75cf7c1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f75cf7c1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f75cf7c1
Branch: refs/heads/master
Commit: f75cf7c176bf5cae740c2d29999d57de87ea07fa
Parents: df8baad4
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Mon Jun 15 09:27:12 2015 -0500
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Mon Jun 15 09:27:12 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f75cf7c1/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 414ad10..30f9020 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 0.11.0
* STORM-847: Add cli to get the last storm error from the topology
* STORM-864: Exclude storm-kafka tests from Travis CI build
+ * STORM-860: UI: while topology is transitioned to killed, "Activate" button is enabled but not functioning
## 0.10.0
* STORM-856: use serialized value of delay secs for topo actions