Merge branch 'STORM-1538' of https://github.com/knusbaum/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f4724655 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f4724655 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f4724655 Branch: refs/heads/master Commit: f4724655740bd67098841789d38ed0c9ee52f0ce Parents: 265ff91 d3d0a86 Author: Boyang Jerry Peng <[email protected]> Authored: Fri Feb 12 09:13:29 2016 -0600 Committer: Boyang Jerry Peng <[email protected]> Committed: Fri Feb 12 09:13:29 2016 -0600 ---------------------------------------------------------------------- .../src/clj/org/apache/storm/daemon/supervisor.clj | 2 +- storm-core/src/clj/org/apache/storm/stats.clj | 14 +++++++------- storm-core/src/jvm/org/apache/storm/utils/Utils.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
