Merge branch 'master' into supervisor
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/afd2e3f5 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/afd2e3f5 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/afd2e3f5 Branch: refs/heads/master Commit: afd2e3f5a53d2a086de1d1d62048377486ab1992 Parents: f03b8be 0100898 Author: xiaojian.fxj <[email protected]> Authored: Fri Mar 25 11:37:48 2016 +0800 Committer: xiaojian.fxj <[email protected]> Committed: Fri Mar 25 11:37:48 2016 +0800 ---------------------------------------------------------------------- CHANGELOG.md | 3 + bin/storm.py | 5 +- .../storm/starter/tools/SlotBasedCounter.java | 12 +-- external/sql/storm-sql-core/pom.xml | 18 ++++ external/storm-hbase/pom.xml | 2 +- .../jvm/org/apache/storm/kafka/KafkaUtils.java | 4 + .../org/apache/storm/daemon/builtin_metrics.clj | 97 -------------------- .../clj/org/apache/storm/daemon/executor.clj | 37 ++++---- .../src/clj/org/apache/storm/daemon/task.clj | 8 +- .../src/jvm/org/apache/storm/StormTimer.java | 1 + .../daemon/metrics/BuiltinBoltMetrics.java | 78 ++++++++++++++++ .../storm/daemon/metrics/BuiltinMetrics.java | 33 +++++++ .../daemon/metrics/BuiltinMetricsUtil.java | 79 ++++++++++++++++ .../daemon/metrics/BuiltinSpoutMetrics.java | 64 +++++++++++++ .../daemon/metrics/SpoutThrottlingMetrics.java | 57 ++++++++++++ .../jvm/org/apache/storm/drpc/DRPCSpout.java | 51 +++++++--- .../jvm/org/apache/storm/stats/StatsUtil.java | 4 +- .../test/clj/org/apache/storm/drpc_test.clj | 69 ++++++++++++-- storm-dist/binary/pom.xml | 10 -- storm-dist/binary/src/main/assembly/binary.xml | 4 +- 20 files changed, 474 insertions(+), 162 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/afd2e3f5/bin/storm.py ----------------------------------------------------------------------
