Return-Path: 
 <commits-return-8347-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 803AA1028E
	for <apmail-spark-commits-archive@minotaur.apache.org>;
 Tue, 30 Dec 2014 17:20:17 +0000 (UTC)
Received: (qmail 72140 invoked by uid 500); 30 Dec 2014 17:20:18 -0000
Delivered-To: apmail-spark-commits-archive@spark.apache.org
Received: (qmail 72110 invoked by uid 500); 30 Dec 2014 17:20:17 -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 72101 invoked by uid 99); 30 Dec 2014 17:20:17 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Dec 2014 17:20:17 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 75BD8A0F016; Tue, 30 Dec 2014 17:20:17 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: joshrosen@apache.org
To: commits@spark.apache.org
Message-Id: <e6f118f576724fbd81ab8d93e32ea643@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: spark git commit: [SPARK-4920][UI] add version on master and worker
 page for standalone mode
Date: Tue, 30 Dec 2014 17:20:17 +0000 (UTC)

Repository: spark
Updated Branches:
  refs/heads/master 040d6f2d1 -> 9077e721c


[SPARK-4920][UI] add version on master and worker page for standalone mode

Author: Zhang, Liye <liye.zhang@intel.com>

Closes #3769 from liyezhang556520/spark-4920_WebVersion and squashes the following commits:

3bb7e0d [Zhang, Liye] add version on master and worker page


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

Branch: refs/heads/master
Commit: 9077e721cd36adfecd50cbd1fd7735d28e5be8b5
Parents: 040d6f2
Author: Zhang, Liye <liye.zhang@intel.com>
Authored: Tue Dec 30 09:19:47 2014 -0800
Committer: Josh Rosen <joshrosen@databricks.com>
Committed: Tue Dec 30 09:19:47 2014 -0800

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/ui/UIUtils.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/9077e721/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
index 7486cb6..b5022fe 100644
--- a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
+++ b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
@@ -234,8 +234,9 @@ private[spark] object UIUtils extends Logging {
             <div class="span12">
               <h3 style="vertical-align: middle; display: inline-block;">
                 <a style="text-decoration: none" href={prependBaseUri("/")}>
-                  <img src={prependBaseUri("/static/spark-logo-77x50px-hd.png")}
-                       style="margin-right: 15px;" />
+                  <img src={prependBaseUri("/static/spark-logo-77x50px-hd.png")} />
+                  <span class="version" 
+                        style="margin-right: 15px;">{org.apache.spark.SPARK_VERSION}</span>
                 </a>
                 {title}
               </h3>


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