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

64ad3b18

Commit 64ad3b18 authored 11 years ago by Reynold Xin

Downloads
- Plain Diff

Merge branch 'master' into rxin

Conflicts:
	graph/src/main/scala/org/apache/spark/graph/impl/GraphImpl.scala

parents 2406bf33 6ee05be1

No related branches found

No related tags found

Loading

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

graph/src/main/scala/org/apache/spark/graph/Analytics.scala 32 additions, 30 deletions

graph/src/main/scala/org/apache/spark/graph/Analytics.scala
graph/src/main/scala/org/apache/spark/graph/GraphOps.scala 21 additions, 15 deletions

graph/src/main/scala/org/apache/spark/graph/GraphOps.scala
graph/src/main/scala/org/apache/spark/graph/Pregel.scala 15 additions, 135 deletions

graph/src/main/scala/org/apache/spark/graph/Pregel.scala
graph/src/main/scala/org/apache/spark/graph/impl/GraphImpl.scala 69 additions, 68 deletions

...rc/main/scala/org/apache/spark/graph/impl/GraphImpl.scala
graphx-shell 124 additions, 0 deletions

graphx-shell
repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala 91 additions, 83 deletions

repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala

with 352 additions and 331 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