Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F21DC10B94 for ; Wed, 11 Sep 2013 17:27:09 +0000 (UTC) Received: (qmail 60283 invoked by uid 500); 11 Sep 2013 17:27:08 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 60189 invoked by uid 500); 11 Sep 2013 17:27:08 -0000 Mailing-List: contact commits-help@spark.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@spark.incubator.apache.org Delivered-To: mailing list commits@spark.incubator.apache.org Received: (qmail 60019 invoked by uid 99); 11 Sep 2013 17:27:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Sep 2013 17:27:05 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 11 Sep 2013 17:27:02 +0000 Received: (qmail 56641 invoked by uid 99); 11 Sep 2013 17:26:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Sep 2013 17:26:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B5D248BE361; Wed, 11 Sep 2013 17:26:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pwendell@apache.org To: commits@spark.incubator.apache.org Date: Wed, 11 Sep 2013 17:26:47 -0000 Message-Id: <9be76c2c63b849c4a207119f75e58e8a@git.apache.org> In-Reply-To: <61ff06dabc0f4fd8954b873112436e3b@git.apache.org> References: <61ff06dabc0f4fd8954b873112436e3b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/13] git commit: SPARK-894 - Not all WebUI fields delivered VIA JSON X-Virus-Checked: Checked by ClamAV on apache.org SPARK-894 - Not all WebUI fields delivered VIA JSON Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/5dd875c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/5dd875c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/5dd875c5 Branch: refs/heads/branch-0.8 Commit: 5dd875c5b569554262741f012e2e3857401c1677 Parents: 8c14f4b Author: David McCauley Authored: Wed Sep 11 10:46:37 2013 +0100 Committer: David McCauley Committed: Wed Sep 11 10:46:37 2013 +0100 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/5dd875c5/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 a6be8ef..87a7034 100644 --- a/core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala +++ b/core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala @@ -44,7 +44,9 @@ private[spark] object JsonProtocol { ("cores" -> obj.desc.maxCores) ~ ("user" -> obj.desc.user) ~ ("memoryperslave" -> obj.desc.memoryPerSlave) ~ - ("submitdate" -> obj.submitDate.toString) + ("submitdate" -> obj.submitDate.toString) ~ + ("state" -> obj.state.toString) ~ + ("duration" -> obj.duration) } def writeApplicationDescription(obj: ApplicationDescription) = {