You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/07/14 21:34:00 UTC
[2/2] storm git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/storm
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/184fd722
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/184fd722
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/184fd722
Branch: refs/heads/master
Commit: 184fd722785741701768a89c2d7341e22fddb50f
Parents: 4eb2e1e b3f0df4
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jul 14 15:18:29 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jul 14 15:18:29 2015 -0400
----------------------------------------------------------------------
.travis.yml | 3 +-
CHANGELOG.md | 22 +-
README.markdown | 5 +-
bin/storm.py | 3 +
conf/defaults.yaml | 2 -
dev-tools/test-ns.py | 21 +-
.../print-errors-from-clojure-test-reports.py | 60 ---
.../travis/print-errors-from-test-reports.py | 76 +++
dev-tools/travis/save-logs.py | 54 +++
dev-tools/travis/travis-build.sh | 50 --
dev-tools/travis/travis-install.sh | 37 ++
dev-tools/travis/travis-script.sh | 43 ++
docs/documentation/Concepts.md | 2 +-
.../Guaranteeing-message-processing.md | 4 +-
docs/documentation/Multilang-protocol.md | 9 +-
...unning-topologies-on-a-production-cluster.md | 4 +-
docs/documentation/Troubleshooting.md | 37 ++
docs/documentation/Tutorial.md | 2 +-
.../java/org/apache/storm/flux/FluxBuilder.java | 2 +-
external/storm-kafka/pom.xml | 10 +-
.../src/jvm/storm/kafka/PartitionManager.java | 1 +
.../src/jvm/storm/kafka/ZkState.java | 2 +-
.../src/jvm/storm/kafka/bolt/KafkaBolt.java | 77 ++-
.../src/test/storm/kafka/KafkaUtilsTest.java | 32 +-
.../src/test/storm/kafka/ZkCoordinatorTest.java | 1 +
.../test/storm/kafka/bolt/KafkaBoltTest.java | 74 ++-
.../storm/redis/bolt/AbstractRedisBolt.java | 42 ++
.../storm/redis/bolt/RedisLookupBolt.java | 23 +-
.../apache/storm/redis/bolt/RedisStoreBolt.java | 21 +
.../redis/common/config/JedisClusterConfig.java | 55 ++-
.../redis/common/config/JedisPoolConfig.java | 66 +++
.../common/container/JedisClusterContainer.java | 18 +
.../JedisCommandsContainerBuilder.java | 15 +
.../JedisCommandsInstanceContainer.java | 12 +
.../redis/common/container/JedisContainer.java | 16 +
.../common/mapper/RedisDataTypeDescription.java | 20 +
.../redis/common/mapper/RedisLookupMapper.java | 7 +-
.../storm/redis/common/mapper/RedisMapper.java | 9 +-
.../redis/common/mapper/RedisStoreMapper.java | 3 +
.../storm/redis/common/mapper/TupleMapper.java | 18 +-
.../trident/state/AbstractRedisMapState.java | 41 ++
.../state/AbstractRedisStateQuerier.java | 28 +-
.../state/AbstractRedisStateUpdater.java | 27 ++
.../storm/redis/trident/state/KeyFactory.java | 22 +
.../storm/redis/trident/state/Options.java | 6 +
.../trident/state/RedisClusterMapState.java | 124 ++++-
.../redis/trident/state/RedisClusterState.java | 44 +-
.../trident/state/RedisClusterStateQuerier.java | 19 +-
.../trident/state/RedisClusterStateUpdater.java | 19 +
.../redis/trident/state/RedisMapState.java | 126 ++++-
.../storm/redis/trident/state/RedisState.java | 44 +-
.../redis/trident/state/RedisStateQuerier.java | 19 +-
.../redis/trident/state/RedisStateUpdater.java | 19 +
log4j2/cluster.xml | 12 +-
log4j2/worker.xml | 12 +-
pom.xml | 10 +-
storm-core/pom.xml | 5 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 23 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 65 +--
.../src/clj/backtype/storm/ui/helpers.clj | 12 +-
storm-core/src/jvm/backtype/storm/Config.java | 74 ++-
.../jvm/backtype/storm/ConfigValidation.java | 18 +
.../backtype/storm/messaging/netty/Client.java | 471 +++++++------------
.../backtype/storm/messaging/netty/Context.java | 20 +-
.../storm/messaging/netty/MessageBatch.java | 24 +-
.../storm/messaging/netty/MessageBuffer.java | 58 +++
.../messaging/netty/SaslStormClientHandler.java | 4 +-
.../messaging/netty/StormClientHandler.java | 46 ++
.../netty/StormClientPipelineFactory.java | 4 +-
.../jvm/backtype/storm/spout/ShellSpout.java | 10 +
.../src/jvm/backtype/storm/task/ShellBolt.java | 9 +
.../backtype/storm/task/TopologyContext.java | 61 ++-
.../jvm/backtype/storm/utils/ShellProcess.java | 21 +
.../test/clj/backtype/storm/config_test.clj | 14 +
storm-core/test/resources/log4j2-test.xml | 2 +-
storm-core/test/resources/test_runner.clj | 114 +++++
76 files changed, 1960 insertions(+), 625 deletions(-)
----------------------------------------------------------------------