diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 74582704c54..ecfd9effe4c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -484,6 +484,7 @@ Release 2.5.0 - UNRELEASED NetworkTopology#sortByDistance. (Yongjun Zhang via wang) HDFS-6583. Remove clientNode in FileUnderConstructionFeature. (wheat9) + BUG FIXES HDFS-6112. NFS Gateway docs are incorrect for allowed hosts configuration. @@ -712,6 +713,9 @@ Release 2.5.0 - UNRELEASED HDFS-6587. Bug in TestBPOfferService can cause test failure. (Zhilei Xu via Arpit Agarwal) + HDFS-6598. Fix a typo in message issued from explorer.js. (Yongjun Zhang + via wheat9) + BREAKDOWN OF HDFS-2006 SUBTASKS AND RELATED JIRAS HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js index 7b126516cff..4e739b3912f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js @@ -58,7 +58,7 @@ var msg = '
Path does not exist on HDFS or WebHDFS is disabled. Please check your path or enable WebHDFS
'; break; default: - var msg = 'Failed to retreive data from ' + url + ': ' + err + '
'; + var msg = 'Failed to retrieve data from ' + url + ': ' + err + '
'; } show_err_msg(msg); };