storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [07/20] git commit: Merge branch 'master' into show-recent-error
Date Thu, 31 Jul 2014 00:04:11 GMT
Merge branch 'master' into show-recent-error


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

Branch: refs/heads/security
Commit: 2940d9d43eab0c27d1ed1331472baa932e966d13
Parents: e5efcf5 85c9cd5
Author: Kishor Patil <kpatil@yahoo-inc.com>
Authored: Fri Jul 18 15:10:50 2014 +0000
Committer: Kishor Patil <kpatil@yahoo-inc.com>
Committed: Fri Jul 18 15:10:50 2014 +0000

----------------------------------------------------------------------
 BYLAWS.md                                       |  96 ++++
 CHANGELOG.md                                    |  18 +
 LICENSE                                         |   2 +-
 README.markdown                                 |   7 +
 STORM-UI-REST-API.md                            | 546 +++++++++++++++++++
 bin/storm                                       |  77 ++-
 conf/defaults.yaml                              |   2 +
 conf/storm_env.ini                              |   2 +-
 examples/storm-starter/README.markdown          |  27 +-
 .../src/jvm/storm/starter/RollingTopWords.java  |  62 ++-
 .../src/jvm/storm/starter/util/StormRunner.java |   8 +
 .../storm-kafka/src/jvm/storm/kafka/Broker.java |   9 +-
 .../src/jvm/storm/kafka/Partition.java          |   9 +-
 pom.xml                                         |   6 +-
 .../src/clj/backtype/storm/LocalCluster.clj     |   7 +-
 storm-core/src/clj/backtype/storm/cluster.clj   |  31 +-
 .../src/clj/backtype/storm/command/monitor.clj  |  37 ++
 .../src/clj/backtype/storm/daemon/common.clj    |   2 +-
 .../src/clj/backtype/storm/daemon/drpc.clj      |   7 +-
 .../src/clj/backtype/storm/daemon/logviewer.clj | 181 ++++--
 .../src/clj/backtype/storm/daemon/nimbus.clj    |   6 +-
 .../clj/backtype/storm/daemon/supervisor.clj    |  54 +-
 .../src/clj/backtype/storm/daemon/worker.clj    |  27 +-
 storm-core/src/clj/backtype/storm/disruptor.clj |   2 +-
 storm-core/src/clj/backtype/storm/event.clj     |   2 +-
 storm-core/src/clj/backtype/storm/testing.clj   |  77 +--
 .../src/clj/backtype/storm/ui/helpers.clj       |   5 +
 storm-core/src/clj/backtype/storm/util.clj      |  54 +-
 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   | 150 ++---
 .../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 ++++---
 .../test/clj/backtype/storm/supervisor_test.clj |  45 +-
 57 files changed, 2411 insertions(+), 334 deletions(-)
----------------------------------------------------------------------


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

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


Mime
View raw message