aboutsummaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorDavid McCauley <david.mccauley@wandisco.com>2013-10-02 13:23:38 +0100
committerDavid McCauley <david.mccauley@wandisco.com>2013-10-02 13:23:38 +0100
commit351da546767abd1604fa8f3c7b5f2939fa476ef0 (patch)
tree90eb05531ebe0ee238ee45133c933f2ebbfadfb8 /core/src
parent714fdabd99bbff3a0cdec5dcf06b021a3a3f2da8 (diff)
downloadspark-351da546767abd1604fa8f3c7b5f2939fa476ef0.tar.gz
spark-351da546767abd1604fa8f3c7b5f2939fa476ef0.tar.bz2
spark-351da546767abd1604fa8f3c7b5f2939fa476ef0.zip
SPARK-920 - JSON endpoint URI scheme part (spark://) duplicated
Diffstat (limited to 'core/src')
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala b/core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala
index 87a703427c..ad74f5604f 100644
--- a/core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala
@@ -64,7 +64,7 @@ private[spark] object JsonProtocol {
}
def writeMasterState(obj: MasterStateResponse) = {
- ("url" -> ("spark://" + obj.uri)) ~
+ ("url" -> obj.uri) ~
("workers" -> obj.workers.toList.map(writeWorkerInfo)) ~
("cores" -> obj.workers.map(_.cores).sum) ~
("coresused" -> obj.workers.map(_.coresUsed).sum) ~