Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
spark
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs525-sp18-g07
spark
Commits
549ee388
Commit
549ee388
authored
12 years ago
by
Tyson
Browse files
Options
Downloads
Patches
Plain Diff
Removed io.spray spray-json dependency as it is not needed.
parent
bf9d9946
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/src/main/scala/spark/deploy/JsonProtocol.scala
+1
-3
1 addition, 3 deletions
core/src/main/scala/spark/deploy/JsonProtocol.scala
project/SparkBuild.scala
+0
-1
0 additions, 1 deletion
project/SparkBuild.scala
with
1 addition
and
4 deletions
core/src/main/scala/spark/deploy/JsonProtocol.scala
+
1
−
3
View file @
549ee388
package
spark.deploy
import
master.
{
JobInfo
,
WorkerInfo
}
import
spray.json._
import
cc.
spray.json._
/**
* spray-json helper class containing implicit conversion to json for marshalling responses
*/
private
[
spark
]
object
JsonProtocol
extends
DefaultJsonProtocol
{
import
cc.spray.json._
implicit
object
WorkerInfoJsonFormat
extends
RootJsonWriter
[
WorkerInfo
]
{
def
write
(
obj
:
WorkerInfo
)
=
JsObject
(
"id"
->
JsString
(
obj
.
id
),
...
...
This diff is collapsed.
Click to expand it.
project/SparkBuild.scala
+
0
−
1
View file @
549ee388
...
...
@@ -134,7 +134,6 @@ object SparkBuild extends Build {
"cc.spray"
%
"spray-can"
%
"1.0-M2.1"
,
"cc.spray"
%
"spray-server"
%
"1.0-M2.1"
,
"cc.spray"
%%
"spray-json"
%
"1.1.1"
,
"io.spray"
%%
"spray-json"
%
"1.2.3"
,
"org.apache.mesos"
%
"mesos"
%
"0.9.0-incubating"
)
++
(
if
(
HADOOP_MAJOR_VERSION
==
"2"
)
Some
(
"org.apache.hadoop"
%
"hadoop-client"
%
HADOOP_VERSION
)
else
None
).
toSeq
,
unmanagedSourceDirectories
in
Compile
<+=
baseDirectory
{
_
/
(
"src/hadoop"
+
HADOOP_MAJOR_VERSION
+
"/scala"
)
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment