diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-06-26 18:22:12 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-06-26 18:22:12 -0700 |
| commit | c4dd68ae21f63c85b8c6e6f77bfdf19e14835e65 (patch) | |
| tree | 8f0b70868ef06644ef93ad16c3f87229dfcb61ca /repl | |
| parent | b626562d5487908a65d78de71566ecd12d253df0 (diff) | |
| parent | db7a2c4897aabf0b00a8df347dae1ad579e767f9 (diff) | |
| download | spark-c4dd68ae21f63c85b8c6e6f77bfdf19e14835e65.tar.gz spark-c4dd68ae21f63c85b8c6e6f77bfdf19e14835e65.tar.bz2 spark-c4dd68ae21f63c85b8c6e6f77bfdf19e14835e65.zip | |
Merge branch 'mos-bt'
This merge keeps only the broadcast work in mos-bt because the structure
of shuffle has changed with the new RDD design. We still need some kind
of parallel shuffle but that will be added later.
Conflicts:
core/src/main/scala/spark/BitTorrentBroadcast.scala
core/src/main/scala/spark/ChainedBroadcast.scala
core/src/main/scala/spark/RDD.scala
core/src/main/scala/spark/SparkContext.scala
core/src/main/scala/spark/Utils.scala
core/src/main/scala/spark/shuffle/BasicLocalFileShuffle.scala
core/src/main/scala/spark/shuffle/DfsShuffle.scala
Diffstat (limited to 'repl')
0 files changed, 0 insertions, 0 deletions