Merge remote-tracking branch 'upstream/master' into STORM-676
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ac590b43 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ac590b43 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ac590b43 Branch: refs/heads/master Commit: ac590b43022007a5a0c047c232767bdfd763278b Parents: 1bac2a9 f118060 Author: Satish Duggana <[email protected]> Authored: Sat Mar 26 23:01:18 2016 +0530 Committer: Satish Duggana <[email protected]> Committed: Sat Mar 26 23:01:18 2016 +0530 ---------------------------------------------------------------------- CHANGELOG.md | 7 ++ bin/storm.py | 5 +- docs/Documentation.md | 50 ---------- docs/README.md | 50 ++++++++++ docs/index.md | 3 +- docs/windows-users-guide.md | 21 +++++ .../storm/starter/tools/SlotBasedCounter.java | 12 +-- .../main/java/org/apache/storm/flux/Flux.java | 22 ++--- external/sql/storm-sql-core/pom.xml | 18 ++++ external/storm-hbase/pom.xml | 2 +- .../storm/hbase/bolt/AbstractHBaseBolt.java | 1 - .../org/apache/storm/hbase/bolt/HBaseBolt.java | 18 +--- .../jvm/org/apache/storm/kafka/KafkaUtils.java | 4 + pom.xml | 6 +- storm-core/pom.xml | 2 +- .../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 +++++++--- .../serialization/BlowfishTupleSerializer.java | 24 ++--- .../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 +- 30 files changed, 579 insertions(+), 258 deletions(-) ----------------------------------------------------------------------
