-
- Downloads
Merge remote-tracking branch 'apache/master' into conf2
Conflicts: core/src/main/scala/org/apache/spark/SparkContext.scala core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
No related branches found
No related tags found
Showing
- core/src/main/resources/org/apache/spark/default-log4j.properties 8 additions, 0 deletions.../main/resources/org/apache/spark/default-log4j.properties
- core/src/main/scala/org/apache/spark/HttpServer.scala 1 addition, 0 deletionscore/src/main/scala/org/apache/spark/HttpServer.scala
- core/src/main/scala/org/apache/spark/Logging.scala 36 additions, 5 deletionscore/src/main/scala/org/apache/spark/Logging.scala
- core/src/main/scala/org/apache/spark/SparkContext.scala 0 additions, 3 deletionscore/src/main/scala/org/apache/spark/SparkContext.scala
- core/src/main/scala/org/apache/spark/executor/Executor.scala 0 additions, 2 deletionscore/src/main/scala/org/apache/spark/executor/Executor.scala
- core/src/main/scala/org/apache/spark/metrics/MetricsConfig.scala 0 additions, 1 deletion...c/main/scala/org/apache/spark/metrics/MetricsConfig.scala
- core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala 0 additions, 1 deletion...c/main/scala/org/apache/spark/metrics/MetricsSystem.scala
- core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala 0 additions, 2 deletions...la/org/apache/spark/storage/BlockManagerMasterActor.scala
- core/src/main/scala/org/apache/spark/storage/BlockManagerWorker.scala 0 additions, 3 deletions...n/scala/org/apache/spark/storage/BlockManagerWorker.scala
- core/src/main/scala/org/apache/spark/storage/BlockMessageArray.scala 0 additions, 2 deletions...in/scala/org/apache/spark/storage/BlockMessageArray.scala
- core/src/test/scala/org/apache/spark/CheckpointSuite.scala 0 additions, 2 deletionscore/src/test/scala/org/apache/spark/CheckpointSuite.scala
- spark-class 7 additions, 2 deletionsspark-class
- streaming/src/main/scala/org/apache/spark/streaming/DStream.scala 0 additions, 2 deletions...g/src/main/scala/org/apache/spark/streaming/DStream.scala
- streaming/src/main/scala/org/apache/spark/streaming/DStreamGraph.scala 0 additions, 1 deletion.../main/scala/org/apache/spark/streaming/DStreamGraph.scala
- streaming/src/main/scala/org/apache/spark/streaming/StreamingContext.scala 0 additions, 2 deletions...n/scala/org/apache/spark/streaming/StreamingContext.scala
- streaming/src/main/scala/org/apache/spark/streaming/dstream/NetworkInputDStream.scala 0 additions, 2 deletions.../apache/spark/streaming/dstream/NetworkInputDStream.scala
- streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala 0 additions, 2 deletions...a/org/apache/spark/streaming/scheduler/JobGenerator.scala
- streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobScheduler.scala 0 additions, 2 deletions...a/org/apache/spark/streaming/scheduler/JobScheduler.scala
- streaming/src/main/scala/org/apache/spark/streaming/util/MasterFailureTest.scala 0 additions, 3 deletions...a/org/apache/spark/streaming/util/MasterFailureTest.scala
Loading
Please register or sign in to comment