You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/08/29 18:34:10 UTC

[1/3] git commit: Update STORM-UI-REST-API.md

Repository: incubator-storm
Updated Branches:
  refs/heads/master c69ced723 -> dab609695


Update STORM-UI-REST-API.md

It appears that the window parameter is in seconds, not milliseconds.  Very small issue, but thought it might trip people up.

Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/2b7c79a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/2b7c79a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/2b7c79a2

Branch: refs/heads/master
Commit: 2b7c79a2bd66f0502515851935a3d92eb34c3453
Parents: 9968b8b
Author: ashtonwebster <as...@gmail.com>
Authored: Wed Aug 13 18:27:59 2014 -0400
Committer: ashtonwebster <as...@gmail.com>
Committed: Wed Aug 13 18:27:59 2014 -0400

----------------------------------------------------------------------
 STORM-UI-REST-API.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/2b7c79a2/STORM-UI-REST-API.md
----------------------------------------------------------------------
diff --git a/STORM-UI-REST-API.md b/STORM-UI-REST-API.md
index 6dda435..98a270d 100644
--- a/STORM-UI-REST-API.md
+++ b/STORM-UI-REST-API.md
@@ -129,7 +129,7 @@ Request Parameters:
 |Parameter |Value   |Description  |
 |----------|--------|-------------|
 |id   	   |String (required)| Topology Id  |
-|window    |String. Default value :all-time| Window duration for metrics in ms|
+|window    |String. Default value :all-time| Window duration for metrics in seconds|
 |sys       |String. Values 1 or 0. Default value 0| Controls including sys stats part of the response|
 
 
@@ -336,7 +336,7 @@ Returns detailed metrics and executor information
 |----------|--------|-------------|
 |id   	   |String (required)| Topology Id  |
 |component |String (required)| Component Id |
-|window    |String. Default value :all-time| window duration for metrics in ms|
+|window    |String. Default value :all-time| window duration for metrics in seconds|
 |sys       |String. Values 1 or 0. Default value 0| controls including sys stats part of the response|
 
 Response Fields:


[3/3] git commit: update changelog for STORM-454

Posted by pt...@apache.org.
update changelog for STORM-454


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/dab60969
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/dab60969
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/dab60969

Branch: refs/heads/master
Commit: dab6096958983b603e292e80256dfd09ccd3e9b2
Parents: 53f9de4
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Aug 29 12:06:47 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Aug 29 12:06:47 2014 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/dab60969/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa5ad7f..66465b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.9.3-incubating
+ * STORM-454: correct documentation in STORM-UI-REST-API.md
  * STORM-474: Reformat UI HTML code
  * STORM-447: shade/relocate packages of dependencies that are common causes of dependency conflicts
  * STORM-279: cluster.xml doesn't take in STORM_LOG_DIR values.


[2/3] git commit: Merge branch 'patch-1' of github.com:ashtonwebster/incubator-storm

Posted by pt...@apache.org.
Merge branch 'patch-1' of github.com:ashtonwebster/incubator-storm


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/53f9de4b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/53f9de4b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/53f9de4b

Branch: refs/heads/master
Commit: 53f9de4b001b8949e7ed45759adefb787c350ed2
Parents: c69ced7 2b7c79a
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Aug 29 12:02:54 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Aug 29 12:02:54 2014 -0400

----------------------------------------------------------------------
 STORM-UI-REST-API.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/53f9de4b/STORM-UI-REST-API.md
----------------------------------------------------------------------