diff options
| author | Mark Roberts <wizzat@gmail.com> | 2014-04-30 18:05:45 -0700 |
|---|---|---|
| committer | Mark Roberts <wizzat@gmail.com> | 2014-04-30 18:05:45 -0700 |
| commit | 7a7a8186cc5eed803b0aba8bda71a1e760de30f9 (patch) | |
| tree | 0bab56a9a759be695b0e0ea52870927fbdf03e06 | |
| parent | 0d57c2718fcf3819f2c18911126f245e9e9ce3e0 (diff) | |
| parent | be06b307b1ad5462a64915c5cde49ed23a1a1fac (diff) | |
| download | kafka-python-7a7a8186cc5eed803b0aba8bda71a1e760de30f9.tar.gz | |
Merge branch 'add_tests' into exception_refactor
| -rwxr-xr-x | build_integration.sh | 2 | ||||
| -rw-r--r-- | servers/0.8.0/resources/kafka.properties | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build_integration.sh b/build_integration.sh index 80b3410..da87f34 100755 --- a/build_integration.sh +++ b/build_integration.sh @@ -2,4 +2,4 @@ git submodule update --init (cd servers/0.8.0/kafka-src && ./sbt update package assembly-package-dependency) -(cd servers/0.8.1/kafka-src && ./gradlew jarAll) +(cd servers/0.8.1/kafka-src && ./gradlew jar) diff --git a/servers/0.8.0/resources/kafka.properties b/servers/0.8.0/resources/kafka.properties index f8732fb..c9fd552 100644 --- a/servers/0.8.0/resources/kafka.properties +++ b/servers/0.8.0/resources/kafka.properties @@ -31,7 +31,7 @@ socket.request.max.bytes=104857600 ############################# Log Basics ############################# -log.dir={tmp_dir}/data +log.dirs={tmp_dir}/data num.partitions={partitions} default.replication.factor={replicas} |