Added scope to dependencies Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2b1d89e8 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2b1d89e8 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2b1d89e8 Branch: refs/heads/master Commit: 2b1d89e8183cf0a056b42b1a22ee60b918973e97 Parents: 431cbb2 00c18c9 Author: Shoeb Mohammed <[email protected]> Authored: Mon Feb 8 10:10:06 2016 -0600 Committer: Shoeb Mohammed <[email protected]> Committed: Mon Feb 8 10:10:06 2016 -0600 ---------------------------------------------------------------------- CHANGELOG.md | 11 +- README.markdown | 4 +- conf/defaults.yaml | 4 + .../starter/trident/TridentMapExample.java | 123 ++++++ external/storm-hdfs/README.md | 15 +- external/storm-hdfs/pom.xml | 22 + .../storm/hdfs/avro/AbstractAvroSerializer.java | 80 ++++ .../storm/hdfs/avro/AvroSchemaRegistry.java | 28 ++ .../org/apache/storm/hdfs/avro/AvroUtils.java | 44 ++ .../hdfs/avro/ConfluentAvroSerializer.java | 83 ++++ .../storm/hdfs/avro/FixedAvroSerializer.java | 67 +++ .../storm/hdfs/avro/GenericAvroSerializer.java | 36 ++ .../storm/hdfs/bolt/AvroGenericRecordBolt.java | 4 - .../hdfs/avro/TestFixedAvroSerializer.java | 76 ++++ .../hdfs/avro/TestGenericAvroSerializer.java | 68 +++ .../test/resources/FixedAvroSerializer.config | 2 + .../jvm/org/apache/storm/kafka/KafkaSpout.java | 8 +- .../jvm/org/apache/storm/kafka/KafkaUtils.java | 44 +- .../apache/storm/kafka/PartitionManager.java | 42 +- .../kafka/trident/TridentKafkaEmitter.java | 23 +- pom.xml | 3 + .../cluster_state/zookeeper_state_factory.clj | 56 +-- .../org/apache/storm/command/dev_zookeeper.clj | 3 +- .../apache/storm/command/shell_submission.clj | 5 +- .../src/clj/org/apache/storm/daemon/common.clj | 19 +- .../src/clj/org/apache/storm/daemon/drpc.clj | 2 +- .../clj/org/apache/storm/daemon/executor.clj | 4 +- .../clj/org/apache/storm/daemon/logviewer.clj | 2 +- .../src/clj/org/apache/storm/daemon/nimbus.clj | 5 +- .../clj/org/apache/storm/daemon/supervisor.clj | 2 +- .../src/clj/org/apache/storm/daemon/task.clj | 2 + storm-core/src/clj/org/apache/storm/testing.clj | 11 +- storm-core/src/clj/org/apache/storm/ui/core.clj | 4 +- .../src/clj/org/apache/storm/zookeeper.clj | 253 +---------- storm-core/src/jvm/org/apache/storm/Config.java | 39 ++ .../jvm/org/apache/storm/callback/Callback.java | 23 + .../storm/callback/DefaultWatcherCallBack.java | 35 ++ .../apache/storm/callback/WatcherCallBack.java | 24 ++ .../storm/daemon/metrics/MetricsUtils.java | 108 +++++ .../reporters/ConsolePreparableReporter.java | 76 ++++ .../reporters/CsvPreparableReporter.java | 80 ++++ .../reporters/JmxPreparableReporter.java | 70 +++ .../metrics/reporters/PreparableReporter.java | 32 ++ .../org/apache/storm/nimbus/ILeaderElector.java | 6 +- .../testing/staticmocking/MockedZookeeper.java | 31 ++ .../jvm/org/apache/storm/trident/Stream.java | 87 +++- .../storm/trident/operation/Consumer.java | 35 ++ .../trident/operation/FlatMapFunction.java | 37 ++ .../storm/trident/operation/MapFunction.java | 36 ++ .../operation/impl/ConsumerExecutor.java | 38 ++ .../operation/impl/FlatMapFunctionExecutor.java | 43 ++ .../operation/impl/MapFunctionExecutor.java | 41 ++ .../trident/planner/processor/MapProcessor.java | 87 ++++ .../src/jvm/org/apache/storm/utils/Utils.java | 36 +- .../storm/zookeeper/LeaderElectorImp.java | 121 ++++++ .../apache/storm/zookeeper/ZkEventTypes.java | 43 ++ .../apache/storm/zookeeper/ZkKeeperStates.java | 41 ++ .../org/apache/storm/zookeeper/Zookeeper.java | 430 +++++++++++++++++++ .../test/clj/org/apache/storm/cluster_test.clj | 39 +- .../test/clj/org/apache/storm/nimbus_test.clj | 20 +- .../apache/storm/blobstore/BlobStoreTest.java | 1 + 61 files changed, 2418 insertions(+), 396 deletions(-) ----------------------------------------------------------------------
