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

1fb1b099

Commit 1fb1b099 authored 11 years ago by Reynold Xin

Downloads
- Plain Diff

Merge pull request #841 from rxin/json

Use the JSON formatter from Scala library and removed dependency on lift-json.

parents c69c4894 c961c19b

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

core/pom.xml 0 additions, 4 deletions

core/pom.xml
core/src/main/scala/spark/deploy/JsonProtocol.scala 55 additions, 53 deletions

core/src/main/scala/spark/deploy/JsonProtocol.scala
core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala 2 additions, 3 deletions

...c/main/scala/spark/deploy/master/ui/ApplicationPage.scala
core/src/main/scala/spark/deploy/master/ui/IndexPage.scala 2 additions, 3 deletions

core/src/main/scala/spark/deploy/master/ui/IndexPage.scala
core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala 2 additions, 3 deletions

core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
core/src/main/scala/spark/ui/JettyUtils.scala 3 additions, 4 deletions

core/src/main/scala/spark/ui/JettyUtils.scala
pom.xml 0 additions, 5 deletions

pom.xml
project/SparkBuild.scala 0 additions, 1 deletion

project/SparkBuild.scala

with 64 additions and 76 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