Merge branch 'PR-2007-merge-1.x' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d6fa3d41 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d6fa3d41 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d6fa3d41 Branch: refs/heads/1.x-branch Commit: d6fa3d411b158093edacd5a11aa5dd3de1a481cb Parents: f00b21d 6e61038 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Mon Mar 20 18:41:05 2017 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Mon Mar 20 18:41:05 2017 +0900 ---------------------------------------------------------------------- integration-test/config/cluster.xml | 19 ++++++++++++------- log4j2/cluster.xml | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
