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

3548c9c0

Commit 3548c9c0 authored 12 years ago by Matei Zaharia

Downloads
- Plain Diff

Merge branch 'master' of github.com:mesos/spark

parents 9cc764f5 6d1c2302

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/spark/deploy/JsonProtocol.scala 57 additions, 0 deletions

core/src/main/scala/spark/deploy/JsonProtocol.scala
core/src/main/scala/spark/deploy/master/MasterWebUI.scala 14 additions, 5 deletions

core/src/main/scala/spark/deploy/master/MasterWebUI.scala
core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala 15 additions, 5 deletions

core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala
core/src/main/scala/spark/network/Connection.scala 5 additions, 2 deletions

core/src/main/scala/spark/network/Connection.scala
core/src/main/scala/spark/network/ConnectionManager.scala 6 additions, 6 deletions

core/src/main/scala/spark/network/ConnectionManager.scala
core/src/main/scala/spark/network/ConnectionManagerTest.scala 16 additions, 8 deletions

.../src/main/scala/spark/network/ConnectionManagerTest.scala
project/SparkBuild.scala 2 additions, 0 deletions

project/SparkBuild.scala
run 3 additions, 9 deletions

run

with 118 additions and 35 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