diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-07-06 15:51:41 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-07-06 15:51:41 -0700 |
| commit | 1ffadb2d9e87169ccc406cd34dab6bd7beda70f1 (patch) | |
| tree | cb5439f40df3865ec71d285700e377d9d5822c7d /core/src/test/resources | |
| parent | 94871e4703d8566359a405da58c60f411b14857a (diff) | |
| parent | 37abe84212c6dad6fb87a3b47666d6a3c14c1f66 (diff) | |
| download | spark-1ffadb2d9e87169ccc406cd34dab6bd7beda70f1.tar.gz spark-1ffadb2d9e87169ccc406cd34dab6bd7beda70f1.tar.bz2 spark-1ffadb2d9e87169ccc406cd34dab6bd7beda70f1.zip | |
Merge remote-tracking branch 'pwendell/ui-updates'
Conflicts:
core/src/main/scala/spark/scheduler/DAGScheduler.scala
core/src/main/scala/spark/util/AkkaUtils.scala
pom.xml
Diffstat (limited to 'core/src/test/resources')
| -rw-r--r-- | core/src/test/resources/log4j.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties index 6ec89c0184..d05cf3dec1 100644 --- a/core/src/test/resources/log4j.properties +++ b/core/src/test/resources/log4j.properties @@ -8,3 +8,4 @@ log4j.appender.file.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss.SSS} %p %c{1}: # Ignore messages below warning level from Jetty, because it's a bit verbose log4j.logger.org.eclipse.jetty=WARN +org.eclipse.jetty.LEVEL=WARN |