| commit | 2d2b0009e662db75cf22e2ce8d618ed0a8e61c2f | [log] [tgz] |
|---|---|---|
| author | Tsz-Wo Nicholas Sze <szetszwo@hortonworks.com> | Thu Sep 18 13:00:29 2014 +0800 |
| committer | Tsz-Wo Nicholas Sze <szetszwo@hortonworks.com> | Thu Sep 18 13:00:29 2014 +0800 |
| tree | c35d9b39b88268c27dc1de71c335610dd23c8c3c | |
| parent | 911979c8ab2e6dd4fe82023ae022a1582c8590c2 [diff] | |
| parent | ee21b13cbd4654d7181306404174329f12193613 [diff] |
Merge branch 'trunk' into HDFS-6584 Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java