diff options
| author | Reynold Xin <reynoldx@gmail.com> | 2013-08-15 17:49:37 -0700 |
|---|---|---|
| committer | Reynold Xin <reynoldx@gmail.com> | 2013-08-15 17:49:37 -0700 |
| commit | eddbf43b548897dc9602635f5f02145ad288e6ec (patch) | |
| tree | 372060da5ad70ac2ef326faac3aeb10f7e211c09 /core | |
| parent | 230ab2722ebd399afcf64c1a131f4929f602177d (diff) | |
| download | spark-eddbf43b548897dc9602635f5f02145ad288e6ec.tar.gz spark-eddbf43b548897dc9602635f5f02145ad288e6ec.tar.bz2 spark-eddbf43b548897dc9602635f5f02145ad288e6ec.zip | |
Revert "Merge pull request #834 from Daemoen/master"
This reverts commit 230ab2722ebd399afcf64c1a131f4929f602177d, reversing
changes made to 659553b21ddd7504889ce113a816c1db4a73f167.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/deploy/JsonProtocol.scala | 3 |
1 files changed, 1 insertions, 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) = { |