arp 65ef35bbab Merge branch 'trunk' into HDFS-6581 ... Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml		2014-09-30 18:20:13 -07:00
..
hadoop-hdfs	Merge branch 'trunk' into HDFS-6581	2014-09-30 18:20:13 -07:00
hadoop-hdfs-httpfs	HDFS-7159. Use block storage policy to set lazy persist preference. (Arpit Agarwal)	2014-09-29 22:27:59 -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