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	HADOOP-13537. Support external calls in the RPC call queue. Contributed by Daryn Sharp.	2016-09-29 13:27:30 -05:00
src	Merge branch 'trunk' into HDFS-7240	2016-11-11 10:49:05 -08:00
HadoopCommon.cmake	HADOOP-12727. Minor cleanups needed for CMake 3.X (Alan Burlison via aw)	2016-05-26 07:37:22 -07:00
HadoopJNI.cmake	HADOOP-12036. Consolidate all of the cmake extensions in one directory (alanburlison via cmccabe)	2015-06-26 12:32:31 -07:00
pom.xml	HADOOP-13789. Hadoop Common includes generated test protos in both jar and test-jar. Contributed by Sean Busbey.	2016-11-08 16:33:55 -08:00