Merge branch 'trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/222bf0fe Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/222bf0fe Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/222bf0fe Branch: refs/heads/HDFS-6581 Commit: 222bf0fe6706ee43964fd39b8315c1a339fbc84a Parents: e4d29fd 25fd69a Author: arp <a...@apache.org> Authored: Fri Sep 19 10:02:27 2014 -0700 Committer: arp <a...@apache.org> Committed: Fri Sep 19 10:02:27 2014 -0700 ---------------------------------------------------------------------- .../hdfs/nfs/nfs3/TestRpcProgramNfs3.java | 3 ++- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 8 +++++++ .../datanode/fsdataset/impl/FsDatasetImpl.java | 16 +++++++++---- .../fsdataset/impl/TestWriteToReplica.java | 25 +++++++++++++++++++- 4 files changed, 46 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/222bf0fe/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/222bf0fe/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestWriteToReplica.java ----------------------------------------------------------------------
