Repository: hadoop
Updated Branches:
refs/heads/branch-2 022474c80 -> ba3182c60
Fix hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt for HDFS-6584 after
merge.
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http:/
Fix hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt for HDFS-6584 after
merge.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fd3cddf3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fd3cddf3
Diff: http://git-wip-us.ap
Fix hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt for HDFS-6584 after
merge.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fd3cddf3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fd3cddf3
Diff: http://git-wip-us.ap
Repository: hadoop
Updated Branches:
refs/heads/trunk 98f7bfe99 -> fd3cddf36
Fix hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt for HDFS-6584 after
merge.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fd3cddf3
Tree: http: