merging upstream/master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c8e337d1 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c8e337d1 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c8e337d1 Branch: refs/heads/master Commit: c8e337d13521e6ca5f83639b9a68120618750332 Parents: 62fa05b 544e55c Author: Arun Mahadevan <ai...@hortonworks.com> Authored: Tue Aug 11 10:27:48 2015 +0530 Committer: Arun Mahadevan <ai...@hortonworks.com> Committed: Tue Aug 11 10:27:48 2015 +0530 ---------------------------------------------------------------------- CHANGELOG.md | 16 ++- DEVELOPER.md | 7 +- README.markdown | 1 + external/storm-elasticsearch/README.md | 72 ++++++++++ external/storm-elasticsearch/pom.xml | 95 +++++++++++++ .../elasticsearch/bolt/AbstractEsBolt.java | 81 +++++++++++ .../storm/elasticsearch/bolt/EsIndexBolt.java | 68 ++++++++++ .../elasticsearch/bolt/EsPercolateBolt.java | 78 +++++++++++ .../storm/elasticsearch/common/EsConfig.java | 54 ++++++++ .../storm/elasticsearch/trident/EsState.java | 117 ++++++++++++++++ .../elasticsearch/trident/EsStateFactory.java | 50 +++++++ .../storm/elasticsearch/trident/EsUpdater.java | 31 +++++ .../elasticsearch/bolt/AbstractEsBoltTest.java | 81 +++++++++++ .../elasticsearch/bolt/EsIndexBoltTest.java | 68 ++++++++++ .../elasticsearch/bolt/EsIndexTopology.java | 120 +++++++++++++++++ .../elasticsearch/bolt/EsPercolateBoltTest.java | 65 +++++++++ .../storm/elasticsearch/common/EsConstants.java | 22 +++ .../storm/elasticsearch/common/EsTestUtil.java | 70 ++++++++++ .../trident/TridentEsTopology.java | 135 +++++++++++++++++++ external/storm-hive/README.md | 1 + .../org/apache/storm/hive/bolt/HiveBolt.java | 44 ++++-- .../apache/storm/hive/common/HiveWriter.java | 5 +- .../apache/storm/hive/bolt/TestHiveBolt.java | 100 ++++++++++++-- .../src/jvm/storm/kafka/ZkCoordinator.java | 2 +- external/storm-redis/README.md | 1 + log4j2/cluster.xml | 6 +- log4j2/worker.xml | 6 +- pom.xml | 1 + storm-core/src/clj/backtype/storm/cluster.clj | 2 +- .../src/clj/backtype/storm/daemon/task.clj | 1 - storm-core/src/clj/backtype/storm/tuple.clj | 6 +- storm-core/src/clj/backtype/storm/zookeeper.clj | 26 ++-- storm-core/src/jvm/backtype/storm/Config.java | 2 +- .../jvm/backtype/storm/ConfigValidation.java | 15 +-- .../src/jvm/backtype/storm/drpc/DRPCSpout.java | 6 +- .../storm/grouping/PartialKeyGrouping.java | 27 +++- .../storm/testing/TestWordBytesCounter.java | 27 ++++ .../backtype/storm/testing/TestWordCounter.java | 6 +- .../src/jvm/storm/trident/TridentTopology.java | 13 +- .../test/clj/backtype/storm/config_test.clj | 19 ++- .../test/clj/backtype/storm/grouping_test.clj | 43 +++--- .../test/clj/backtype/storm/nimbus_test.clj | 29 ++++ storm-dist/binary/src/main/assembly/binary.xml | 14 ++ 43 files changed, 1531 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/c8e337d1/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 646181d,cb00783..a79f5ec --- a/pom.xml +++ b/pom.xml @@@ -169,7 -170,7 +169,8 @@@ <module>external/storm-redis</module> <module>external/storm-eventhubs</module> <module>external/flux</module> + <module>examples/storm-starter</module> + <module>external/storm-elasticsearch</module> </modules> <scm>