Merge branch 'STORM-2325-1.0.x-merge' into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/75d70e6f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/75d70e6f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/75d70e6f Branch: refs/heads/1.0.x-branch Commit: 75d70e6ffb09339066e83011a36472bf60c8d9d6 Parents: 85b4c93 919d63f Author: Jungtaek Lim <kabh...@gmail.com> Authored: Mon Jan 30 22:40:07 2017 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Mon Jan 30 22:40:07 2017 +0900 ---------------------------------------------------------------------- storm-core/src/clj/org/apache/storm/daemon/logviewer.clj | 4 ++-- storm-core/src/jvm/org/apache/storm/utils/Utils.java | 9 +++++++-- storm-core/test/clj/org/apache/storm/logviewer_test.clj | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
