Merge branch 'PR-2007-merge-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/091721df
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/091721df
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/091721df

Branch: refs/heads/1.0.x-branch
Commit: 091721dfe1b6a0d6066db1769d09712669d23f8a
Parents: 2ecbb80 981b396
Author: Jungtaek Lim <kabh...@gmail.com>
Authored: Mon Mar 20 18:41:41 2017 +0900
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Mon Mar 20 18:41:41 2017 +0900

----------------------------------------------------------------------
 integration-test/config/cluster.xml | 19 ++++++++++++-------
 log4j2/cluster.xml                  |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


Reply via email to