Author: wheat9
Date: Thu Jul 24 18:06:29 2014
New Revision: 1613223
URL: http://svn.apache.org/r1613223
Log:
HDFS-6723. Merge r1613222 from branch-2.
Modified:
hadoop/common/branches/branch-2.5/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2.5/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
Modified:
hadoop/common/branches/branch-2.5/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1613223&r1=1613222&r2=1613223&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.5/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.5/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Jul 24 18:06:29 2014
@@ -618,6 +618,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6622. Rename and AddBlock may race and produce invalid edits (kihwal
via cmccabe)
+ HDFS-6723. New NN webUI no longer displays decommissioned state for dead
node.
+ (Ming Ma via wheat9)
+
Release 2.4.1 - 2014-06-23
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.5/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html?rev=1613223&r1=1613222&r2=1613223&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.5/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
(original)
+++
hadoop/common/branches/branch-2.5/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
Thu Jul 24 18:06:29 2014
@@ -283,7 +283,7 @@
<tr class="danger">
<td>{name} ({xferaddr})</td>
<td>{lastContact}</td>
- <td>Dead{?decomissioned}, Decomissioned{/decomissioned}</td>
+ <td>Dead{?decommissioned}, Decommissioned{/decommissioned}</td>
<td>-</td>
<td>-</td>
<td>-</td>
