Merge branch 'STORM-1693-master' of https://github.com/abhishekagarwal87/storm into STORM-1693
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/baaba667 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/baaba667 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/baaba667 Branch: refs/heads/master Commit: baaba667e1ecea3f644974eda72bbfa922b31586 Parents: a41fef3 983c420 Author: Jungtaek Lim <[email protected]> Authored: Fri Apr 15 11:16:46 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Fri Apr 15 11:16:46 2016 +0900 ---------------------------------------------------------------------- .../clj/org/apache/storm/daemon/executor.clj | 3 ++- .../storm/metric/internal/RateTracker.java | 26 -------------------- .../apache/storm/stats/BoltExecutorStats.java | 6 ++--- .../apache/storm/stats/SpoutExecutorStats.java | 4 --- .../org/apache/storm/utils/DisruptorQueue.java | 5 ++++ 5 files changed, 10 insertions(+), 34 deletions(-) ----------------------------------------------------------------------
