Skip to content
Snippets Groups Projects
  1. Dec 27, 2012
  2. Dec 26, 2012
    • Tathagata Das's avatar
      Merge branch 'mesos' into dev-merge · 7c33f762
      Tathagata Das authored
      7c33f762
    • Tathagata Das's avatar
      Merge branch 'dev-checkpoint' of github.com:radlab/spark into dev-merge · 836042bb
      Tathagata Das authored
      Conflicts:
      	core/src/main/scala/spark/ParallelCollection.scala
      	core/src/main/scala/spark/RDD.scala
      	core/src/main/scala/spark/rdd/BlockRDD.scala
      	core/src/main/scala/spark/rdd/CartesianRDD.scala
      	core/src/main/scala/spark/rdd/CoGroupedRDD.scala
      	core/src/main/scala/spark/rdd/CoalescedRDD.scala
      	core/src/main/scala/spark/rdd/FilteredRDD.scala
      	core/src/main/scala/spark/rdd/FlatMappedRDD.scala
      	core/src/main/scala/spark/rdd/GlommedRDD.scala
      	core/src/main/scala/spark/rdd/HadoopRDD.scala
      	core/src/main/scala/spark/rdd/MapPartitionsRDD.scala
      	core/src/main/scala/spark/rdd/MapPartitionsWithSplitRDD.scala
      	core/src/main/scala/spark/rdd/MappedRDD.scala
      	core/src/main/scala/spark/rdd/PipedRDD.scala
      	core/src/main/scala/spark/rdd/SampledRDD.scala
      	core/src/main/scala/spark/rdd/ShuffledRDD.scala
      	core/src/main/scala/spark/rdd/UnionRDD.scala
      	core/src/main/scala/spark/scheduler/ResultTask.scala
      	core/src/test/scala/spark/CheckpointSuite.scala
      836042bb
  3. Dec 24, 2012
  4. Dec 21, 2012
  5. Dec 20, 2012
    • Reynold Xin's avatar
      Merge branch 'master' of github.com:mesos/spark into dev · eac566a7
      Reynold Xin authored
      Conflicts:
      	core/src/main/scala/spark/MapOutputTracker.scala
      	core/src/main/scala/spark/PairRDDFunctions.scala
      	core/src/main/scala/spark/ParallelCollection.scala
      	core/src/main/scala/spark/RDD.scala
      	core/src/main/scala/spark/rdd/BlockRDD.scala
      	core/src/main/scala/spark/rdd/CartesianRDD.scala
      	core/src/main/scala/spark/rdd/CoGroupedRDD.scala
      	core/src/main/scala/spark/rdd/CoalescedRDD.scala
      	core/src/main/scala/spark/rdd/FilteredRDD.scala
      	core/src/main/scala/spark/rdd/FlatMappedRDD.scala
      	core/src/main/scala/spark/rdd/GlommedRDD.scala
      	core/src/main/scala/spark/rdd/HadoopRDD.scala
      	core/src/main/scala/spark/rdd/MapPartitionsRDD.scala
      	core/src/main/scala/spark/rdd/MapPartitionsWithSplitRDD.scala
      	core/src/main/scala/spark/rdd/MappedRDD.scala
      	core/src/main/scala/spark/rdd/PipedRDD.scala
      	core/src/main/scala/spark/rdd/SampledRDD.scala
      	core/src/main/scala/spark/rdd/ShuffledRDD.scala
      	core/src/main/scala/spark/rdd/UnionRDD.scala
      	core/src/main/scala/spark/storage/BlockManager.scala
      	core/src/main/scala/spark/storage/BlockManagerId.scala
      	core/src/main/scala/spark/storage/BlockManagerMaster.scala
      	core/src/main/scala/spark/storage/StorageLevel.scala
      	core/src/main/scala/spark/util/MetadataCleaner.scala
      	core/src/main/scala/spark/util/TimeStampedHashMap.scala
      	core/src/test/scala/spark/storage/BlockManagerSuite.scala
      	run
      eac566a7
    • Tathagata Das's avatar
      Merge branch 'dev' of github.com:radlab/spark into dev-checkpoint · 8512dd32
      Tathagata Das authored
      Conflicts:
      	core/src/main/scala/spark/ParallelCollection.scala
      	core/src/test/scala/spark/CheckpointSuite.scala
      	streaming/src/main/scala/spark/streaming/DStream.scala
      8512dd32
    • Tathagata Das's avatar
    • Tathagata Das's avatar
      f9c5b0a6
    • Matei Zaharia's avatar
      Merge pull request #327 from rxin/spark-633 · 5e51b889
      Matei Zaharia authored
      Added the ability in block manager to remove blocks.
      5e51b889
    • Reynold Xin's avatar
      9397c501
  6. Dec 19, 2012
  7. Dec 18, 2012
  8. Dec 17, 2012
  9. Dec 14, 2012
  10. Dec 13, 2012
Loading