11 лет назад · de9271686a
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -13,6 +13,9 @@ Trunk (Unreleased)
 
				 
			
 
				     HDFS-3125. Add JournalService to enable Journal Daemon. (suresh)
			
 
				 
			
 
				+    HDFS-5444. Choose default web UI based on browser capabilities. (Haohui Mai
			
 
				+    via jing9)
			
 
				+
			
 
				   IMPROVEMENTS
			
 
				 
			
 
				     HDFS-4665. Move TestNetworkTopologyWithNodeGroup to common.
			
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
@@ -30,6 +30,12 @@
 
				 </div>
			
 
				 <div id="panel"></div>
			
 
				 </div>
			
 
				+<div class="row">
			
 
				+<hr />
			
 
				+<div class="col-xs-2"><p><a href="http://hadoop.apache.org/core">Hadoop</a>, 2013.</p></div>
			
 
				+<div class="col-xs-1 pull-right"><a style="color: #ddd" href="dfshealth.jsp">Legacy UI</a></div>
			
 
				+</div>
			
 
				+
			
 
				 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js">
			
 
				 </script><script type="text/javascript" src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js">
			
 
				 </script><script type="text/javascript" src="/static/dust-full-2.0.0.min.js">
			
@@ -37,7 +43,5 @@
 
				 </script><script type="text/javascript" src="dfs-dust.js">
			
 
				 </script><script type="text/javascript" src="dfshealth.js">
			
 
				 </script>
			
 
				-<hr />
			
 
				-<p><a href="http://hadoop.apache.org/core">Hadoop</a>, 2013.</p>
			
 
				 </body>
			
 
				 </html>
			
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.jsp
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.jsp
@@ -70,6 +70,6 @@
 
				 <hr/>
			
 
				 <h3>Startup Progress</h3>
			
 
				 <% healthjsp.generateStartupProgress(out, nn.getStartupProgress()); %>
			
 
				-<%
			
 
				-out.println(ServletUtil.htmlFooter());
			
 
				-%>
			
 
				+<hr/><p><a href="http://hadoop.apache.org/core">Hadoop</a>, 2013.&nbsp;<a href="dfshealth.html">New UI</a></p>
			
 
				+</body>
			
 
				+</html>
			
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/index.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/index.html
@@ -14,22 +14,22 @@
 
				    See the License for the specific language governing permissions and
			
 
				    limitations under the License.
			
 
				 -->
			
 
				-<meta HTTP-EQUIV="REFRESH" content="0;url=dfshealth.jsp"/>
			
 
				-<html>
			
 
				+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
			
 
				+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
			
 
				+<html xmlns="http://www.w3.org/1999/xhtml">
			
 
				 <head>
			
 
				+<meta http-equiv="REFRESH" content="1;url=dfshealth.jsp" />
			
 
				 <title>Hadoop Administration</title>
			
 
				 </head>
			
 
				-
			
 
				 <body>
			
 
				-
			
 
				+<script type="text/javascript">
			
 
				+//<![CDATA[
			
 
				+window.location.href='dfshealth.html';
			
 
				+//]]>
			
 
				+</script>
			
 
				 <h1>Hadoop Administration</h1>
			
 
				-
			
 
				 <ul>
			
 
				-
			
 
				 <li><a href="dfshealth.jsp">DFS Health/Status</a></li>
			
 
				-
			
 
				 </ul>
			
 
				-
			
 
				 </body>
			
 
				-
			
 
				 </html>