HDFS-6723. Merge r1613220 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613222 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Haohui Mai 2014-07-24 18:04:44 +00:00
parent db85694a41
commit fce2c0fe75
2 changed files with 4 additions and 1 deletions

View File

@ -730,6 +730,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6622. Rename and AddBlock may race and produce invalid edits (kihwal HDFS-6622. Rename and AddBlock may race and produce invalid edits (kihwal
via cmccabe) 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 Release 2.4.1 - 2014-06-23
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -283,7 +283,7 @@
<tr class="danger"> <tr class="danger">
<td>{name} ({xferaddr})</td> <td>{name} ({xferaddr})</td>
<td>{lastContact}</td> <td>{lastContact}</td>
<td>Dead{?decomissioned}, Decomissioned{/decomissioned}</td> <td>Dead{?decommissioned}, Decommissioned{/decommissioned}</td>
<td>-</td> <td>-</td>
<td>-</td> <td>-</td>
<td>-</td> <td>-</td>