You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/02/25 22:49:58 UTC
[1/4] storm git commit: STORM-687. Storm UI does not display up to
date information despite refreshes in IE.
Repository: storm
Updated Branches:
refs/heads/master d4e943825 -> 182a734e0
STORM-687. Storm UI does not display up to date information despite refreshes in IE.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bb056459
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bb056459
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bb056459
Branch: refs/heads/master
Commit: bb056459ede50694d488b334e687f336628c4cec
Parents: 64d7ac6
Author: Sriharsha Chintalapani <ma...@harsha.io>
Authored: Mon Feb 23 18:22:47 2015 -0800
Committer: Sriharsha Chintalapani <ma...@harsha.io>
Committed: Mon Feb 23 18:22:47 2015 -0800
----------------------------------------------------------------------
storm-core/src/ui/public/component.html | 1 +
storm-core/src/ui/public/index.html | 2 ++
storm-core/src/ui/public/topology.html | 1 +
3 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bb056459/storm-core/src/ui/public/component.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/component.html b/storm-core/src/ui/public/component.html
index 40350d8..ef57d0c 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -63,6 +63,7 @@ $(document).ready(function() {
if(window) url += "&window="+window;
renderToggleSys($("#toggle-switch"));
$.ajaxSetup({
+ "cache": false,
"error":function(jqXHR,textStatus,response) {
var errorJson = jQuery.parseJSON(jqXHR.responseText);
$.get("/templates/json-error-template.html", function(template) {
http://git-wip-us.apache.org/repos/asf/storm/blob/bb056459/storm-core/src/ui/public/index.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/index.html b/storm-core/src/ui/public/index.html
index 6fac19a..50253b0 100644
--- a/storm-core/src/ui/public/index.html
+++ b/storm-core/src/ui/public/index.html
@@ -45,12 +45,14 @@
<div id="json-response-error"></div>
</body>
<script>
+
$(document).ajaxStop($.unblockUI);
$(document).ajaxStart(function(){
$.blockUI({ message: '<img src="images/spinner.gif" /> <h3>Loading summary...</h3>'});
});
$(document).ready(function() {
$.ajaxSetup({
+ "cache": false,
"error":function(jqXHR,textStatus,response) {
var errorJson = jQuery.parseJSON(jqXHR.responseText);
$.get("/templates/json-error-template.html", function(template) {
http://git-wip-us.apache.org/repos/asf/storm/blob/bb056459/storm-core/src/ui/public/topology.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/topology.html b/storm-core/src/ui/public/topology.html
index d1b9eaf..9b27fbb 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -72,6 +72,7 @@ $(document).ready(function() {
if(window) url += "&window="+window;
renderToggleSys($("#toggle-switch"));
$.ajaxSetup({
+ "cache": false,
"error":function(jqXHR,textStatus,response) {
var errorJson = jQuery.parseJSON(jqXHR.responseText);
$.get("/templates/json-error-template.html", function(template) {
[3/4] storm git commit: Merge branch 'STORM-687' of
https://github.com/harshach/incubator-storm into STORM-687
Posted by bo...@apache.org.
Merge branch 'STORM-687' of https://github.com/harshach/incubator-storm into STORM-687
STORM-687: Storm UI does not display up to date information despite refreshes in IE
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5934654d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5934654d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5934654d
Branch: refs/heads/master
Commit: 5934654d9edcbaf6626ae28cefc147771a4a0bdc
Parents: d4e9438 99aeb80
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Feb 25 15:20:07 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Feb 25 15:20:07 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 5 +++--
storm-core/src/ui/public/index.html | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5934654d/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
[2/4] storm git commit: STORM-687. Storm UI does not display up to
date information despite refreshes in IE.
Posted by bo...@apache.org.
STORM-687. Storm UI does not display up to date information despite refreshes in IE.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/99aeb80b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/99aeb80b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/99aeb80b
Branch: refs/heads/master
Commit: 99aeb80b074f1dc48a396b21ec5ca30a8ed09ddb
Parents: bb05645
Author: Sriharsha Chintalapani <ma...@harsha.io>
Authored: Tue Feb 24 13:35:12 2015 -0800
Committer: Sriharsha Chintalapani <ma...@harsha.io>
Committed: Tue Feb 24 13:35:12 2015 -0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 5 +++--
storm-core/src/ui/public/component.html | 1 -
storm-core/src/ui/public/index.html | 1 -
storm-core/src/ui/public/topology.html | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/99aeb80b/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index 6cd821d..09db7e7 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -867,8 +867,9 @@
(defnk json-response
[data callback :serialize-fn to-json :status 200]
{:status status
- :headers (if (not-nil? callback) {"Content-Type" "application/javascript;charset=utf-8"}
- {"Content-Type" "application/json;charset=utf-8"})
+ :headers (merge {"Cache-Control" "no-cache, no-store"}
+ (if (not-nil? callback) {"Content-Type" "application/javascript;charset=utf-8"}
+ {"Content-Type" "application/json;charset=utf-8"}))
:body (if (not-nil? callback)
(wrap-json-in-callback callback (serialize-fn data))
(serialize-fn data))})
http://git-wip-us.apache.org/repos/asf/storm/blob/99aeb80b/storm-core/src/ui/public/component.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/component.html b/storm-core/src/ui/public/component.html
index ef57d0c..40350d8 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -63,7 +63,6 @@ $(document).ready(function() {
if(window) url += "&window="+window;
renderToggleSys($("#toggle-switch"));
$.ajaxSetup({
- "cache": false,
"error":function(jqXHR,textStatus,response) {
var errorJson = jQuery.parseJSON(jqXHR.responseText);
$.get("/templates/json-error-template.html", function(template) {
http://git-wip-us.apache.org/repos/asf/storm/blob/99aeb80b/storm-core/src/ui/public/index.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/index.html b/storm-core/src/ui/public/index.html
index 50253b0..2dda07a 100644
--- a/storm-core/src/ui/public/index.html
+++ b/storm-core/src/ui/public/index.html
@@ -52,7 +52,6 @@ $(document).ajaxStart(function(){
});
$(document).ready(function() {
$.ajaxSetup({
- "cache": false,
"error":function(jqXHR,textStatus,response) {
var errorJson = jQuery.parseJSON(jqXHR.responseText);
$.get("/templates/json-error-template.html", function(template) {
http://git-wip-us.apache.org/repos/asf/storm/blob/99aeb80b/storm-core/src/ui/public/topology.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/topology.html b/storm-core/src/ui/public/topology.html
index 9b27fbb..d1b9eaf 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -72,7 +72,6 @@ $(document).ready(function() {
if(window) url += "&window="+window;
renderToggleSys($("#toggle-switch"));
$.ajaxSetup({
- "cache": false,
"error":function(jqXHR,textStatus,response) {
var errorJson = jQuery.parseJSON(jqXHR.responseText);
$.get("/templates/json-error-template.html", function(template) {
[4/4] storm git commit: Added STORM-687 to changelog
Posted by bo...@apache.org.
Added STORM-687 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/182a734e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/182a734e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/182a734e
Branch: refs/heads/master
Commit: 182a734e0b4a1db31cd503838bada69f90f690ed
Parents: 5934654
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Feb 25 15:21:34 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Feb 25 15:21:34 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/182a734e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58ee5ca..9d177c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,7 @@
* STORM-683: Make false in a conf really evaluate to false in clojure.
* STORM-685: wrong output in log when committed offset is too far behind latest offset
* STORM-688: update Util to compile under JDK8
+ * STORM-687: Storm UI does not display up to date information despite refreshes in IE
## 0.9.3-rc2
* STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor