subject:"\[4\/4\] git commit\: Merge branch 'trunk' into HDFS\-6581"

[4/4] git commit: Merge branch 'trunk' into HDFS-6581

2014-09-27 Thread arp

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/9cbb2c55 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9cbb2c55 Diff:

[4/4] git commit: Merge branch 'trunk' into HDFS-6581

2014-09-19 Thread arp

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:

[4/4] git commit: Merge branch 'trunk' into HDFS-6581

2014-09-17 Thread arp

Merge branch 'trunk' into HDFS-6581 Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a186d514 Tree: