HDFS-6084. Merge r1577401 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577402 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -159,6 +159,9 @@ Release 2.4.0 - UNRELEASED
     HDFS-6080. Improve NFS gateway performance by making rtmax and wtmax
     configurable. (Abin Shahab via brandonli)
 
+    HDFS-6084. Namenode UI - "Hadoop" logo link shouldn't go to hadoop
+    homepage. (Travis Thompson via wheat9)
+
   OPTIMIZATIONS
 
     HDFS-5790. LeaseManager.findPath is very slow when many leases need recovery

hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html

@@ -27,7 +27,7 @@
 <header class="navbar navbar-inverse bs-docs-nav" role="banner">
 <div class="container">
   <div class="navbar-header">
-    <a href="http://hadoop.apache.org/core" class="navbar-brand">Hadoop</a>
+    <div class="navbar-brand">Hadoop</div>
   </div>
 
   <ul class="nav navbar-nav" id="ui-tabs">
@@ -64,7 +64,7 @@
 
 <div class="row">
   <hr />
-  <div class="col-xs-2"><p><a href="http://hadoop.apache.org/core">Hadoop</a>, 2014.</p></div>
+  <div class="col-xs-2"><p>Hadoop, 2014.</p></div>
   <div class="col-xs-1 pull-right"><a style="color: #ddd" href="dfshealth.jsp">Legacy UI</a></div>
 </div>
 </div>

hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html

@@ -126,6 +126,6 @@
     </script><script type="text/javascript" src="explorer.js">
     </script>
     <hr />
-    <p><a href="http://hadoop.apache.org/core">Hadoop</a>, 2013.</p>
+    <p>Hadoop, 2014.</p>
   </body>
 </html>