Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c1ffb2e1 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c1ffb2e1 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c1ffb2e1 Branch: refs/heads/0.10.x-branch Commit: c1ffb2e1e1ec6a8abb5118892ba5aed083222d8b Parents: 7e43a2b 9579c0b Author: P. Taylor Goetz <[email protected]> Authored: Fri Jun 5 13:37:14 2015 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Fri Jun 5 13:37:14 2015 -0400 ---------------------------------------------------------------------- CHANGELOG.md | 3 + external/flux/flux-core/pom.xml | 4 + external/storm-hdfs/pom.xml | 4 + external/storm-jdbc/pom.xml | 4 + external/storm-kafka/pom.xml | 8 + pom.xml | 18 +- storm-core/pom.xml | 226 +++++++++++++++++++- storm-core/test/resources/log4j2-test.xml | 32 +++ storm-core/test/resources/logback-test.xml | 26 --- storm-dist/binary/src/main/assembly/binary.xml | 44 ++++ 10 files changed, 321 insertions(+), 48 deletions(-) ----------------------------------------------------------------------
