arp 032e0eba6b Merge branch 'trunk' into HDFS-6581 ...

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

2014-09-25 19:50:28 -07:00

..

hadoop-hdfs

Merge branch 'trunk' into HDFS-6581

2014-09-25 19:50:28 -07:00

hadoop-hdfs-httpfs

Merge branch 'trunk' into HDFS-6581

2014-09-16 14:32:57 -07:00

hadoop-hdfs-nfs

HDFS-7096. Fix TestRpcProgramNfs3 to use DFS_ENCRYPTION_KEY_PROVIDER_URI (clamb via cmccabe)

2014-09-19 09:20:25 -07:00

pom.xml

HDFS-4762 Provide HDFS based NFSv3 and Mountd implementation. Contributed by Brandon Li

2013-07-02 17:31:58 +00:00