diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2013-02-18 13:26:12 -0800 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2013-02-18 13:26:12 -0800 |
| commit | 6a6e6bda5713ccc6da9ca977321a1fcc6d38a1c1 (patch) | |
| tree | 3848e9e09a2c8b7537f4a0635ea0a32daee1f9a8 /streaming/src/test/resources/log4j.properties | |
| parent | 56b9bd197c522f33e354c2e9ad7e76440cf817e9 (diff) | |
| parent | 8ad561dc7d6475d7b217ec3f57bac3b584fed31a (diff) | |
| download | spark-6a6e6bda5713ccc6da9ca977321a1fcc6d38a1c1.tar.gz spark-6a6e6bda5713ccc6da9ca977321a1fcc6d38a1c1.tar.bz2 spark-6a6e6bda5713ccc6da9ca977321a1fcc6d38a1c1.zip | |
Merge branch 'streaming' into ScrapCode-streaming
Conflicts:
streaming/src/main/scala/spark/streaming/dstream/KafkaInputDStream.scala
streaming/src/main/scala/spark/streaming/dstream/NetworkInputDStream.scala
Diffstat (limited to 'streaming/src/test/resources/log4j.properties')
| -rw-r--r-- | streaming/src/test/resources/log4j.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/streaming/src/test/resources/log4j.properties b/streaming/src/test/resources/log4j.properties index edfa1243fa..59c445e63f 100644 --- a/streaming/src/test/resources/log4j.properties +++ b/streaming/src/test/resources/log4j.properties @@ -1,5 +1,6 @@ # Set everything to be logged to the file streaming/target/unit-tests.log log4j.rootCategory=INFO, file +# log4j.appender.file=org.apache.log4j.FileAppender log4j.appender.file=org.apache.log4j.FileAppender log4j.appender.file.append=false log4j.appender.file.file=streaming/target/unit-tests.log |