You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/03/13 08:39:55 UTC
[1/3] storm git commit: STORM-2408: build failed if
storm.kafka.client.version = 0.10.2.0
Repository: storm
Updated Branches:
refs/heads/1.x-branch 37288d5f2 -> 3ebf81b6c
STORM-2408: build failed if storm.kafka.client.version = 0.10.2.0
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8ff5a721
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8ff5a721
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8ff5a721
Branch: refs/heads/1.x-branch
Commit: 8ff5a7218d4544a324e95a7b30bfd5aeb94553bd
Parents: 37288d5
Author: lukess <lu...@gmail.com>
Authored: Fri Mar 10 17:54:57 2017 -0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Mar 13 17:29:10 2017 +0900
----------------------------------------------------------------------
.../src/test/java/org/apache/storm/kafka/KafkaUnit.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8ff5a721/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java
index 4bf1cea..93b1040 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java
@@ -21,7 +21,10 @@ import kafka.admin.AdminUtils;
import kafka.admin.RackAwareMode;
import kafka.server.KafkaConfig;
import kafka.server.KafkaServer;
-import kafka.utils.*;
+import kafka.utils.MockTime;
+import kafka.utils.TestUtils;
+import kafka.utils.ZKStringSerializer$;
+import kafka.utils.ZkUtils;
import kafka.zk.EmbeddedZookeeper;
import org.I0Itec.zkclient.ZkClient;
import org.apache.kafka.clients.producer.KafkaProducer;
@@ -65,7 +68,7 @@ public class KafkaUnit {
brokerProps.setProperty("log.dirs", Files.createTempDirectory("kafka-").toAbsolutePath().toString());
brokerProps.setProperty("listeners", String.format("PLAINTEXT://%s:%d", KAFKA_HOST, KAFKA_PORT));
KafkaConfig config = new KafkaConfig(brokerProps);
- Time mock = new MockTime();
+ MockTime mock = new MockTime();
kafkaServer = TestUtils.createServer(config, mock);
// setup default Producer
[3/3] storm git commit: STORM-2408: CHANGELOG
Posted by ka...@apache.org.
STORM-2408: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3ebf81b6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3ebf81b6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3ebf81b6
Branch: refs/heads/1.x-branch
Commit: 3ebf81b6c4d710381e6d97ff548ae3a097fa2302
Parents: 7276a69
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Mar 13 17:39:45 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Mar 13 17:39:45 2017 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3ebf81b6/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 592d001..22cd5ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
\ufeff## 1.1.0
+ * STORM-2408: build failed if storm.kafka.client.version = 0.10.2.0
* STORM-2403: Fix KafkaBolt test failure: tick tuple should not be acked
* STORM-2361: Kafka spout - after leader change, it stops committing offsets to ZK
* STORM-2353: Replace kafka-unit by kafka_2.11 and kafka-clients to test kafka-clients:0.10.1.1
[2/3] storm git commit: Merge branch 'STORM-2408-1.x-merge' into
1.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2408-1.x-merge' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7276a693
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7276a693
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7276a693
Branch: refs/heads/1.x-branch
Commit: 7276a6933a4097f578178dd17301c463c87e0af6
Parents: 37288d5 8ff5a72
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Mar 13 17:39:37 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Mar 13 17:39:37 2017 +0900
----------------------------------------------------------------------
.../src/test/java/org/apache/storm/kafka/KafkaUnit.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------