diff options
author | Denny <dennybritz@gmail.com> | 2012-12-05 10:16:56 -0800 |
---|---|---|
committer | Denny <dennybritz@gmail.com> | 2012-12-05 10:16:56 -0800 |
commit | 15df4b0e52c1a594ed07981e6f2ee1602de7ccbb (patch) | |
tree | becf272ab93d07e48c2187939f9572b0e14fb93b /streaming/src/test/resources/log4j.properties | |
parent | 5e2b0a3bf60dead1ac7946c9984b067c926c2904 (diff) | |
parent | a69a82be2682148f5d1ebbdede15a47c90eea73d (diff) | |
download | spark-15df4b0e52c1a594ed07981e6f2ee1602de7ccbb.tar.gz spark-15df4b0e52c1a594ed07981e6f2ee1602de7ccbb.tar.bz2 spark-15df4b0e52c1a594ed07981e6f2ee1602de7ccbb.zip |
Merge branch 'dev' into kafka
Conflicts:
streaming/src/main/scala/spark/streaming/DStream.scala
Diffstat (limited to 'streaming/src/test/resources/log4j.properties')
-rw-r--r-- | streaming/src/test/resources/log4j.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/streaming/src/test/resources/log4j.properties b/streaming/src/test/resources/log4j.properties index 33774b463d..02fe16866e 100644 --- a/streaming/src/test/resources/log4j.properties +++ b/streaming/src/test/resources/log4j.properties @@ -1,5 +1,5 @@ # Set everything to be logged to the console -log4j.rootCategory=INFO, console +log4j.rootCategory=WARN, console log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss.SSS} %p %c{1}: %m%n |