Anu Engineer e55bdefdab Merge branch 'trunk' into HDFS-7240 ... Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/pom.xml hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerLocationManagerImpl.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerManagerImpl.java		2016-11-11 10:49:05 -08:00
..
hadoop-hdfs	Merge branch 'trunk' into HDFS-7240	2016-11-11 10:49:05 -08:00
hadoop-hdfs-client	Merge branch 'trunk' into HDFS-7240	2016-11-11 10:49:05 -08:00
hadoop-hdfs-httpfs	HDFS-10756. Expose getTrashRoot to HTTPFS and WebHDFS. Contributed by Yuanbo Liu.	2016-11-04 18:06:55 -07:00
hadoop-hdfs-native-client	HDFS-10991. Export hdfsTruncateFile symbol in libhdfs. Contributed by Surendra Singh Lilhore.	2016-10-11 15:07:14 -07:00
hadoop-hdfs-nfs	HDFS-10970. Update jackson from 1.9.13 to 2.x in hadoop-hdfs.	2016-11-07 11:16:31 +09:00
pom.xml	HDFS-10957. Retire BKJM from trunk (Vinayakumar B)	2016-10-06 19:28:25 +05:30