storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [08/50] git commit: Merge branch 'master' into STORM-364
Date Tue, 29 Jul 2014 20:58:07 GMT
Merge branch 'master' into STORM-364


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

Branch: refs/heads/security
Commit: fe95ca4bafa75e120c6b7e8dc828d3f8e8c2461c
Parents: 9c186aa 69b4601
Author: shelld0h <ryan66141@gmail.com>
Authored: Fri Jul 18 18:49:27 2014 +0800
Committer: shelld0h <ryan66141@gmail.com>
Committed: Fri Jul 18 18:49:27 2014 +0800

----------------------------------------------------------------------
 BYLAWS.md                                       |  96 ++++
 CHANGELOG.md                                    |  12 +
 LICENSE                                         |   2 +-
 README.markdown                                 |   4 +
 STORM-UI-REST-API.md                            | 546 +++++++++++++++++++
 bin/storm                                       |  20 +-
 conf/storm_env.ini                              |   2 +-
 .../storm-kafka/src/jvm/storm/kafka/Broker.java |   9 +-
 .../src/jvm/storm/kafka/Partition.java          |   9 +-
 storm-core/src/clj/backtype/storm/cluster.clj   |  29 +
 .../src/clj/backtype/storm/command/monitor.clj  |  37 ++
 .../src/clj/backtype/storm/daemon/logviewer.clj | 181 ++++--
 .../clj/backtype/storm/daemon/supervisor.clj    |  29 +-
 .../src/clj/backtype/storm/daemon/worker.clj    |  16 +-
 storm-core/src/clj/backtype/storm/testing.clj   |   5 +-
 .../src/clj/backtype/storm/ui/helpers.clj       |   5 +
 storm-core/src/clj/backtype/storm/zookeeper.clj |  25 +
 .../src/dev/resources/tester_bolt_metrics.py    |  35 ++
 .../src/dev/resources/tester_spout_metrics.py   |  51 ++
 storm-core/src/jvm/backtype/storm/Config.java   | 121 ++--
 .../jvm/backtype/storm/ConfigValidation.java    |  70 +++
 .../metric/api/rpc/AssignableShellMetric.java   |  30 +
 .../metric/api/rpc/CombinedShellMetric.java     |  31 ++
 .../storm/metric/api/rpc/CountShellMetric.java  |  38 ++
 .../storm/metric/api/rpc/IShellMetric.java      |  31 ++
 .../metric/api/rpc/ReducedShellMetric.java      |  32 ++
 .../storm/multilang/JsonSerializer.java         |  10 +
 .../jvm/backtype/storm/multilang/ShellMsg.java  |  20 +
 .../jvm/backtype/storm/spout/ShellSpout.java    |  44 +-
 .../src/jvm/backtype/storm/task/ShellBolt.java  |  47 +-
 .../backtype/storm/task/TopologyContext.java    |  24 +
 .../storm/testing/PythonShellMetricsBolt.java   |  32 ++
 .../storm/testing/PythonShellMetricsSpout.java  |  35 ++
 .../storm/ui/InvalidRequestException.java       |  20 +
 .../src/jvm/backtype/storm/utils/Monitor.java   | 249 +++++++++
 .../jvm/backtype/storm/utils/ShellProcess.java  |  46 +-
 .../src/jvm/backtype/storm/utils/Utils.java     |  23 +-
 storm-core/src/multilang/py/storm.py            |  11 +-
 storm-core/src/ui/public/component.html         |  22 +-
 storm-core/src/ui/public/css/style.css          |   1 +
 .../src/ui/public/js/jquery.tablesorter.min.js  |   9 +-
 storm-core/src/ui/public/topology.html          |   4 +-
 .../test/clj/backtype/storm/config_test.clj     |  41 +-
 .../test/clj/backtype/storm/metrics_test.clj    | 206 ++++---
 44 files changed, 2079 insertions(+), 231 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/fe95ca4b/storm-core/src/clj/backtype/storm/ui/helpers.clj
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/fe95ca4b/storm-core/src/ui/public/component.html
----------------------------------------------------------------------


Mime
View raw message