Updated Branches: refs/heads/master 08641932b -> 100222b04
SPARK-920 - JSON endpoint URI scheme part (spark://) duplicated Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/351da546 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/351da546 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/351da546 Branch: refs/heads/master Commit: 351da546767abd1604fa8f3c7b5f2939fa476ef0 Parents: 714fdab Author: David McCauley <david.mccau...@wandisco.com> Authored: Wed Oct 2 13:23:38 2013 +0100 Committer: David McCauley <david.mccau...@wandisco.com> Committed: Wed Oct 2 13:23:38 2013 +0100 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/351da546/core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala ---------------------------------------------------------------------- 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 87a7034..ad74f56 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) ~
