Return-Path: 
 <commits-return-10583-apmail-spark-commits-archive=spark.apache.org@spark.apache.org>
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 6DB7917613
	for <apmail-spark-commits-archive@minotaur.apache.org>;
 Wed, 15 Apr 2015 01:52:52 +0000 (UTC)
Received: (qmail 62603 invoked by uid 500); 15 Apr 2015 01:52:52 -0000
Delivered-To: apmail-spark-commits-archive@spark.apache.org
Received: (qmail 62572 invoked by uid 500); 15 Apr 2015 01:52:52 -0000
Mailing-List: contact commits-help@spark.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@spark.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@spark.apache.org>
List-Post: <mailto:commits@spark.apache.org>
List-Id: <commits.spark.apache.org>
Delivered-To: mailing list commits@spark.apache.org
Received: (qmail 62563 invoked by uid 99); 15 Apr 2015 01:52:52 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Apr 2015 01:52:52 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 383DFE042D; Wed, 15 Apr 2015 01:52:52 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: andrewor14@apache.org
To: commits@spark.apache.org
Message-Id: <9ff0977b44c14ea18905646552260b4f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: spark git commit: [SPARK-5634] [core] Show correct message in HS when
 no incomplete apps f...
Date: Wed, 15 Apr 2015 01:52:52 +0000 (UTC)

Repository: spark
Updated Branches:
  refs/heads/master 971738936 -> 30a6e0dcc


[SPARK-5634] [core] Show correct message in HS when no incomplete apps f...

...ound.

Author: Marcelo Vanzin <vanzin@cloudera.com>

Closes #5515 from vanzin/SPARK-5634 and squashes the following commits:

f74ecf1 [Marcelo Vanzin] [SPARK-5634] [core] Show correct message in HS when no incomplete apps found.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/30a6e0dc
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/30a6e0dc
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/30a6e0dc

Branch: refs/heads/master
Commit: 30a6e0dcc0bd298731c1387546779cddcc16bc72
Parents: 9717389
Author: Marcelo Vanzin <vanzin@cloudera.com>
Authored: Tue Apr 14 18:52:48 2015 -0700
Committer: Andrew Or <andrew@databricks.com>
Committed: Tue Apr 14 18:52:48 2015 -0700

----------------------------------------------------------------------
 .../main/scala/org/apache/spark/deploy/history/HistoryPage.scala   | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/30a6e0dc/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala b/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
index 6e432d6..3781b4e 100644
--- a/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
@@ -90,6 +90,8 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
                 </span>
               </h4> ++
               appTable
+            } else if (requestedIncomplete) {
+              <h4>No incomplete applications found!</h4>
             } else {
               <h4>No completed applications found!</h4> ++
               <p>Did you specify the correct logging directory?


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org