hadoop/hadoop-hdfs-project/hadoop-hdfs-client
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
..
dev-support HDFS-9694. Make existing DFSClient#getFileChecksum() work for striped blocks. Contributed by Kai Zheng 2016-03-26 19:58:09 -07:00
src Merge branch 'trunk' into HDFS-7240 2016-11-11 10:49:05 -08:00
pom.xml Merge branch 'trunk' into HDFS-7240 2016-11-11 10:49:05 -08:00