Merge branch 'STORM-1693' of https://github.com/abhishekagarwal87/storm into STORM-1693-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b20c63fb Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b20c63fb Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b20c63fb Branch: refs/heads/1.x-branch Commit: b20c63fb02f8ba5d3b011e013d5a2a5f61ef28fe Parents: ddc3c04 3923e17 Author: Jungtaek Lim <[email protected]> Authored: Fri Apr 15 11:10:09 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Fri Apr 15 11:10:09 2016 +0900 ---------------------------------------------------------------------- .../clj/org/apache/storm/daemon/executor.clj | 2 +- storm-core/src/clj/org/apache/storm/stats.clj | 20 ++++++++++----- .../storm/metric/internal/RateTracker.java | 26 -------------------- .../org/apache/storm/utils/DisruptorQueue.java | 16 +++++++----- 4 files changed, 25 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/b20c63fb/storm-core/src/clj/org/apache/storm/stats.clj ----------------------------------------------------------------------
