Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

spark
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

4ca273ed

Commit 4ca273ed authored 12 years ago by Stephen Haberman

Downloads
- Plain Diff

Merge branch 'master' into shufflecoalesce

Conflicts:
	core/src/test/scala/spark/RDDSuite.scala

parents 00170eb0 b8949cab

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

README.md 2 additions, 0 deletions

README.md
core/src/main/scala/spark/RDD.scala 65 additions, 1 deletion

core/src/main/scala/spark/RDD.scala
core/src/main/scala/spark/executor/Executor.scala 41 additions, 46 deletions

core/src/main/scala/spark/executor/Executor.scala
core/src/main/scala/spark/executor/MesosExecutorBackend.scala 10 additions, 6 deletions

.../src/main/scala/spark/executor/MesosExecutorBackend.scala
core/src/main/scala/spark/executor/StandaloneExecutorBackend.scala 9 additions, 4 deletions

...main/scala/spark/executor/StandaloneExecutorBackend.scala
core/src/main/scala/spark/rdd/CoGroupedRDD.scala 35 additions, 8 deletions

core/src/main/scala/spark/rdd/CoGroupedRDD.scala
core/src/test/scala/spark/RDDSuite.scala 91 additions, 1 deletion

core/src/test/scala/spark/RDDSuite.scala
docs/_layouts/global.html 1 addition, 0 deletions

docs/_layouts/global.html
docs/building-with-maven.md 66 additions, 0 deletions

docs/building-with-maven.md
docs/index.md 3 additions, 0 deletions

docs/index.md

with 323 additions and 66 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment