Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-5444. Merge change r1541753 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544634 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jing Zhao 2013-11-22 18:45:31 +00:00
parent 78af36bb07
commit addb9f1e22
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -25,6 +25,9 @@ Release 2.3.0 - UNRELEASED
HDFS-3987. Support webhdfs over HTTPS. (Haohui Mai via jing9) HDFS-3987. Support webhdfs over HTTPS. (Haohui Mai via jing9)
HDFS-5444. Choose default web UI based on browser capabilities. (Haohui Mai
via jing9)
IMPROVEMENTS IMPROVEMENTS
HDFS-5267. Remove volatile from LightWeightHashSet. (Junping Du via llu) HDFS-5267. Remove volatile from LightWeightHashSet. (Junping Du via llu)

8
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
View File

@ -30,6 +30,12 @@
</div> </div>
<div id="panel"></div> <div id="panel"></div>
</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="/static/jquery-1.10.2.min.js"> <script type="text/javascript" src="/static/jquery-1.10.2.min.js">
</script><script type="text/javascript" src="/static/bootstrap-3.0.2/js/bootstrap.min.js"> </script><script type="text/javascript" src="/static/bootstrap-3.0.2/js/bootstrap.min.js">
</script><script type="text/javascript" src="/static/dust-full-2.0.0.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="dfs-dust.js">
</script><script type="text/javascript" src="dfshealth.js"> </script><script type="text/javascript" src="dfshealth.js">
</script> </script>
<hr />
<p><a href="http://hadoop.apache.org/core">Hadoop</a>, 2013.</p>
</body> </body>
</html> </html>

6
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.jsp
View File

@ -70,6 +70,6 @@
<hr/> <hr/>
<h3>Startup Progress</h3> <h3>Startup Progress</h3>
<% healthjsp.generateStartupProgress(out, nn.getStartupProgress()); %> <% healthjsp.generateStartupProgress(out, nn.getStartupProgress()); %>
<% <hr/><p><a href="http://hadoop.apache.org/core">Hadoop</a>, 2013.&nbsp;<a href="dfshealth.html">New UI</a></p>
out.println(ServletUtil.htmlFooter()); </body>
%> </html>

18
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/index.html
View File

@ -14,22 +14,22 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<meta HTTP-EQUIV="REFRESH" content="0;url=dfshealth.jsp"/> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<html> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="REFRESH" content="1;url=dfshealth.jsp" />
<title>Hadoop Administration</title> <title>Hadoop Administration</title>
</head> </head>
<body> <body>
<script type="text/javascript">
//<![CDATA[
window.location.href='dfshealth.html';
//]]>
</script>
<h1>Hadoop Administration</h1> <h1>Hadoop Administration</h1>
<ul> <ul>
<li><a href="dfshealth.jsp">DFS Health/Status</a></li> <li><a href="dfshealth.jsp">DFS Health/Status</a></li>
</ul> </ul>
</body> </body>
</html> </html>