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 2014/04/25 18:35:00 UTC

[1/3] git commit: STORM-296. Storm kafka unit tests are failing on windows.

Repository: incubator-storm
Updated Branches:
  refs/heads/master 33e9bce61 -> 920955ba7


STORM-296. Storm kafka unit tests are failing on windows.


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/c7a7127f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/c7a7127f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/c7a7127f

Branch: refs/heads/master
Commit: c7a7127fcfe6aaefd0dab928334095368cdfadbe
Parents: 8c90f17
Author: Sriharsha Chintalapani <ma...@harsha.io>
Authored: Thu Apr 24 19:59:20 2014 -0700
Committer: Sriharsha Chintalapani <ma...@harsha.io>
Committed: Thu Apr 24 19:59:20 2014 -0700

----------------------------------------------------------------------
 external/storm-kafka/src/test/storm/kafka/KafkaTestBroker.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/c7a7127f/external/storm-kafka/src/test/storm/kafka/KafkaTestBroker.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/test/storm/kafka/KafkaTestBroker.java b/external/storm-kafka/src/test/storm/kafka/KafkaTestBroker.java
index db4663d..db21aaa 100644
--- a/external/storm-kafka/src/test/storm/kafka/KafkaTestBroker.java
+++ b/external/storm-kafka/src/test/storm/kafka/KafkaTestBroker.java
@@ -25,12 +25,14 @@ public class KafkaTestBroker {
             server = new TestingServer();
             zookeeperConnectionString = server.getConnectString();
             ExponentialBackoffRetry retryPolicy = new ExponentialBackoffRetry(1000, 3);
+            String tempDir = System.getProperty("java.io.tmpdir");
             CuratorFramework zookeeper = CuratorFrameworkFactory.newClient(zookeeperConnectionString, retryPolicy);
             zookeeper.start();
             Properties p = new Properties();
             p.setProperty("zookeeper.connect", zookeeperConnectionString);
             p.setProperty("broker.id", "0");
             p.setProperty("port", "" + port);
+            p.setProperty("log.dirs",tempDir+"kafka_tmp_logs");
             kafka.server.KafkaConfig config = new kafka.server.KafkaConfig(p);
             kafka = new KafkaServerStartable(config);
             kafka.startup();


[2/3] git commit: Merge branch 'kafka-unittest-fix' of github.com:harshach/incubator-storm

Posted by pt...@apache.org.
Merge branch 'kafka-unittest-fix' of github.com:harshach/incubator-storm


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/e652939f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/e652939f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/e652939f

Branch: refs/heads/master
Commit: e652939f0f48e29218394c81658cfcaac7186e35
Parents: 33e9bce c7a7127
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 25 12:33:56 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 25 12:33:56 2014 -0400

----------------------------------------------------------------------
 external/storm-kafka/src/test/storm/kafka/KafkaTestBroker.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------



[3/3] git commit: STORM-296: update changelog

Posted by pt...@apache.org.
STORM-296: update changelog


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/920955ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/920955ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/920955ba

Branch: refs/heads/master
Commit: 920955ba756509aea049be46772d09956354da31
Parents: e652939
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 25 12:34:51 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 25 12:34:51 2014 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/920955ba/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6bd26f..81726c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.9.2-incubating (unreleased)
+ * STORM-296. Storm kafka unit tests are failing on windows
  * STORM-291: upgrade http-client to 4.3.3
  * STORM-252: Upgrade curator to latest version
  * STORM-294: Commas not escaped in command line