From eddbf43b548897dc9602635f5f02145ad288e6ec Mon Sep 17 00:00:00 2001
From: Reynold Xin <reynoldx@gmail.com>
Date: Thu, 15 Aug 2013 17:49:37 -0700
Subject: [PATCH] Revert "Merge pull request #834 from Daemoen/master"
This reverts commit 230ab2722ebd399afcf64c1a131f4929f602177d, reversing
changes made to 659553b21ddd7504889ce113a816c1db4a73f167.
---
core/src/main/scala/spark/deploy/JsonProtocol.scala | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/core/src/main/scala/spark/deploy/JsonProtocol.scala b/core/src/main/scala/spark/deploy/JsonProtocol.scala
index 9901bb8a8c..bd1db7c294 100644
--- a/core/src/main/scala/spark/deploy/JsonProtocol.scala
+++ b/core/src/main/scala/spark/deploy/JsonProtocol.scala
@@ -33,8 +33,7 @@ private[spark] object JsonProtocol {
("cores" -> obj.cores) ~
("coresused" -> obj.coresUsed) ~
("memory" -> obj.memory) ~
- ("memoryused" -> obj.memoryUsed) ~
- ("state" -> obj.getState)
+ ("memoryused" -> obj.memoryUsed)
}
def writeApplicationInfo(obj: ApplicationInfo) = {
--
GitLab