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 2014/07/16 16:48:16 UTC
[11/11] git commit: Merge branch 'STORM-312'
Merge branch 'STORM-312'
Conflicts:
CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/69b4601f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/69b4601f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/69b4601f
Branch: refs/heads/master
Commit: 69b4601f71bad51605813fca10a18ccb82859dd2
Parents: 96e81c1 ae383e3
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Wed Jul 16 09:20:20 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Wed Jul 16 09:20:20 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
bin/storm | 20 +-
.../src/clj/backtype/storm/command/monitor.clj | 37 +++
.../src/jvm/backtype/storm/utils/Monitor.java | 249 +++++++++++++++++++
5 files changed, 307 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/69b4601f/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index f198eea,efd21c3..2817e5d
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -17,7 -17,7 +17,8 @@@
* STORM-351: multilang python process fall into endless loop
* STORM-375: Smarter downloading of assignments by supervisors and workers
* STORM-328: More restrictive Config checks, strict range check within Utils.getInt()
+ * STORM-381: Replace broken jquery.tablesorter.min.js to latest
+ * STORM-312: add storm monitor tools to monitor throughtput interactively
## 0.9.2-incubating
* STORM-66: send taskid on initial handshake