-
- Downloads
Merge branch 'master' into wip-merge-master
Conflicts: bagel/pom.xml core/pom.xml core/src/test/scala/org/apache/spark/ui/UISuite.scala examples/pom.xml mllib/pom.xml pom.xml project/SparkBuild.scala repl/pom.xml streaming/pom.xml tools/pom.xml In scala 2.10, a shorter representation is used for naming artifacts so changed to shorter scala version for artifacts and made it a property in pom.
No related branches found
No related tags found
Showing
- assembly/pom.xml 9 additions, 9 deletionsassembly/pom.xml
- bagel/pom.xml 2 additions, 2 deletionsbagel/pom.xml
- core/pom.xml 5 additions, 6 deletionscore/pom.xml
- core/src/main/scala/org/apache/spark/CacheManager.scala 11 additions, 10 deletionscore/src/main/scala/org/apache/spark/CacheManager.scala
- core/src/main/scala/org/apache/spark/SparkContext.scala 31 additions, 8 deletionscore/src/main/scala/org/apache/spark/SparkContext.scala
- core/src/main/scala/org/apache/spark/api/python/PythonPartitioner.scala 7 additions, 3 deletions...scala/org/apache/spark/api/python/PythonPartitioner.scala
- core/src/main/scala/org/apache/spark/api/python/PythonRDD.scala 3 additions, 3 deletions...rc/main/scala/org/apache/spark/api/python/PythonRDD.scala
- core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala 2 additions, 1 deletion...src/main/scala/org/apache/spark/deploy/JsonProtocol.scala
- core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala 10 additions, 2 deletions.../main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala
- core/src/main/scala/org/apache/spark/rdd/HadoopRDD.scala 117 additions, 23 deletionscore/src/main/scala/org/apache/spark/rdd/HadoopRDD.scala
- core/src/main/scala/org/apache/spark/storage/BlockManager.scala 11 additions, 1 deletion...rc/main/scala/org/apache/spark/storage/BlockManager.scala
- core/src/main/scala/org/apache/spark/util/Utils.scala 13 additions, 0 deletionscore/src/main/scala/org/apache/spark/util/Utils.scala
- core/src/test/scala/org/apache/spark/scheduler/SparkListenerSuite.scala 5 additions, 1 deletion...scala/org/apache/spark/scheduler/SparkListenerSuite.scala
- core/src/test/scala/org/apache/spark/ui/UISuite.scala 7 additions, 0 deletionscore/src/test/scala/org/apache/spark/ui/UISuite.scala
- core/src/test/scala/org/apache/spark/util/UtilsSuite.scala 11 additions, 0 deletionscore/src/test/scala/org/apache/spark/util/UtilsSuite.scala
- docs/_layouts/global.html 2 additions, 2 deletionsdocs/_layouts/global.html
- ec2/spark_ec2.py 2 additions, 2 deletionsec2/spark_ec2.py
- examples/pom.xml 20 additions, 6 deletionsexamples/pom.xml
- mllib/pom.xml 4 additions, 4 deletionsmllib/pom.xml
- pom.xml 2 additions, 1 deletionpom.xml
Loading
Please register or sign in to comment