diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-07-12 14:49:16 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-07-12 14:49:16 +0530 |
| commit | e86d5dbaad9de3c04fe080b8fb96a7ebbd20c7cd (patch) | |
| tree | 2dcdbfa2daf5836357def8744447043ed2181c4e /core/src/test/resources | |
| parent | 6e6d94ffdfa885432408d6996bad7df2a641748a (diff) | |
| parent | bc19477efbe9ad18a27516a771dd14c497368516 (diff) | |
| download | spark-e86d5dbaad9de3c04fe080b8fb96a7ebbd20c7cd.tar.gz spark-e86d5dbaad9de3c04fe080b8fb96a7ebbd20c7cd.tar.bz2 spark-e86d5dbaad9de3c04fe080b8fb96a7ebbd20c7cd.zip | |
Merge branch 'master' into master-merge
Conflicts:
README.md
core/pom.xml
core/src/main/scala/spark/deploy/JsonProtocol.scala
core/src/main/scala/spark/deploy/LocalSparkCluster.scala
core/src/main/scala/spark/deploy/master/Master.scala
core/src/main/scala/spark/deploy/master/MasterWebUI.scala
core/src/main/scala/spark/deploy/worker/Worker.scala
core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala
core/src/main/scala/spark/storage/BlockManagerUI.scala
core/src/main/scala/spark/util/AkkaUtils.scala
pom.xml
project/SparkBuild.scala
streaming/src/main/scala/spark/streaming/receivers/ActorReceiver.scala
Diffstat (limited to 'core/src/test/resources')
| -rw-r--r-- | core/src/test/resources/fairscheduler.xml | 1 | ||||
| -rw-r--r-- | core/src/test/resources/log4j.properties | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/src/test/resources/fairscheduler.xml b/core/src/test/resources/fairscheduler.xml index 5a688b0ebb..6e573b1883 100644 --- a/core/src/test/resources/fairscheduler.xml +++ b/core/src/test/resources/fairscheduler.xml @@ -1,3 +1,4 @@ +<?xml version="1.0"?> <allocations> <pool name="1"> <minShare>2</minShare> 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 |