You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/12/08 18:14:37 UTC
[3/5] storm git commit: Merge branch 'master' of
https://github.com/apache/storm into STORM-2104
Merge branch 'master' of https://github.com/apache/storm into STORM-2104
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/29b52e9c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/29b52e9c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/29b52e9c
Branch: refs/heads/master
Commit: 29b52e9c266b130642d99e665ff73c55dfabba13
Parents: bd1f5c5 57998b4
Author: Stig Rohde D�ssing <sd...@it-minds.dk>
Authored: Tue Nov 29 20:54:47 2016 +0100
Committer: Stig Rohde D�ssing <sd...@it-minds.dk>
Committed: Tue Nov 29 20:54:47 2016 +0100
----------------------------------------------------------------------
CHANGELOG.md | 9 +
docs/index.md | 12 +-
docs/storm-cassandra.md | 23 --
docs/storm-druid.md | 119 +++++++++
docs/storm-kafka-client.md | 188 ++++++++++++++
docs/storm-kinesis.md | 136 ++++++++++
docs/storm-mongodb.md | 23 --
docs/storm-opentsdb.md | 52 ++++
docs/storm-redis.md | 24 --
docs/storm-sql-reference.md | 111 +++++++-
examples/storm-starter/pom.xml | 1 +
external/flux/pom.xml | 6 -
external/storm-cassandra/pom.xml | 7 -
external/storm-eventhubs/pom.xml | 6 -
external/storm-hdfs/pom.xml | 6 -
.../apache/storm/hdfs/trident/HdfsState.java | 31 +--
external/storm-hive/pom.xml | 6 -
external/storm-jdbc/pom.xml | 6 -
external/storm-jms/examples/pom.xml | 1 -
external/storm-jms/pom.xml | 12 -
external/storm-kafka-client/pom.xml | 5 -
.../storm/kafka/monitor/KafkaOffsetLagUtil.java | 6 +-
external/storm-kafka/pom.xml | 6 -
.../storm/kafka/DynamicBrokersReader.java | 8 +-
.../src/jvm/org/apache/storm/kafka/ZkState.java | 2 +-
.../storm/kinesis/spout/ZKConnection.java | 2 +-
external/storm-metrics/pom.xml | 1 -
external/storm-solr/pom.xml | 6 -
.../maven-shade-clojure-transformer/pom.xml | 1 -
storm-buildtools/storm-maven-plugins/pom.xml | 2 +-
storm-core/pom.xml | 2 +-
.../storm/cluster/StormClusterStateImpl.java | 8 +-
.../jvm/org/apache/storm/daemon/DrpcServer.java | 2 +-
.../org/apache/storm/daemon/StormCommon.java | 16 +-
.../org/apache/storm/drpc/ReturnResults.java | 14 +-
.../jvm/org/apache/storm/executor/Executor.java | 7 +-
.../apache/storm/grouping/ShuffleGrouping.java | 12 +-
.../apache/storm/multilang/JsonSerializer.java | 11 +-
.../jvm/org/apache/storm/spout/ShellSpout.java | 1 +
.../storm/task/GeneralTopologyContext.java | 11 +-
.../apache/storm/topology/TopologyBuilder.java | 12 +-
.../trident/drpc/ReturnResultsReducer.java | 11 +-
.../state/JSONNonTransactionalSerializer.java | 5 +-
.../trident/state/JSONOpaqueSerializer.java | 6 +-
.../state/JSONTransactionalSerializer.java | 6 +-
.../storm/trident/testing/TuplifyArgs.java | 14 +-
.../topology/state/TransactionalState.java | 2 +-
.../apache/storm/ui/FilterConfiguration.java | 2 +-
.../apache/storm/utils/TopologySpoutLag.java | 7 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 4 +-
.../src/native/worker-launcher/impl/main.c | 3 +-
.../worker-launcher/impl/worker-launcher.c | 260 ++++++-------------
.../worker-launcher/impl/worker-launcher.h | 16 +-
.../storm/grouping/ShuffleGroupingTest.java | 147 +++++++++++
storm-dist/binary/pom.xml | 2 +-
storm-dist/source/pom.xml | 2 +-
storm-multilang/javascript/pom.xml | 2 +-
storm-multilang/python/pom.xml | 2 +-
storm-multilang/ruby/pom.xml | 2 +-
storm-rename-hack/pom.xml | 3 +-
60 files changed, 982 insertions(+), 428 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/29b52e9c/external/storm-kafka-client/pom.xml
----------------------------------------------------------------------
diff --cc external/storm-kafka-client/pom.xml
index 2b56336,a7971e2..97ed359
--- a/external/storm-kafka-client/pom.xml
+++ b/external/storm-kafka-client/pom.xml
@@@ -71,19 -71,7 +71,14 @@@
<!--test dependencies -->
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ <version>${mockito.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>