Merge branch 'STORM-2063-1.0.x' 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/f22e32e7 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f22e32e7 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f22e32e7 Branch: refs/heads/1.0.x-branch Commit: f22e32e7866944f5f605222e80edfe6478fe1cb9 Parents: 9ce36ad 54dd2a8 Author: Jungtaek Lim <[email protected]> Authored: Wed Aug 31 16:25:44 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Wed Aug 31 16:25:44 2016 +0900 ---------------------------------------------------------------------- log4j2/worker.xml | 2 +- storm-core/src/clj/org/apache/storm/util.clj | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
