Revise the HDFS-6584 entry CHANGES.txt.
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/788ba5e4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/788ba5e4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/788ba5e4
Branch: refs/heads/branch-2
Commit: 788ba5e4c46a0a797ce659ac2569008e538e9934
Parents: 80bd4d8
Author: Tsz-Wo Nicholas Sze <szets...@hortonworks.com>
Authored: Fri Sep 19 07:46:18 2014 +0800
Committer: Tsz-Wo Nicholas Sze <szets...@hortonworks.com>
Committed: Fri Sep 26 04:59:00 2014 +0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/788ba5e4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 0d6dd67..2c6bf0e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -6,8 +6,8 @@ Release 2.6.0 - UNRELEASED
NEW FEATURES
- HDFS-6584. Support archival storage; see the detail subtasks in the
- breakdown section. (szetszwo)
+ HDFS-6584. Support archival storage. (See breakdown of tasks below for
+ features and contributors)
IMPROVEMENTS
