arp b1000fbba4 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/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java		2014-09-24 20:08:32 -07:00
..
ant/org/apache/hadoop/ant
contrib	HDFS-6634. inotify in HDFS. Contributed by James Thomas.	2014-09-02 14:02:29 -07:00
main	Merge branch 'trunk' into HDFS-6581	2014-09-24 20:08:32 -07:00
site	Merge branch 'trunk' into HDFS-6584	2014-09-18 13:00:29 +08:00
test	Merge branch 'trunk' into HDFS-6581	2014-09-24 20:08:32 -07:00
CMakeLists.txt	HDFS-6534. Fix build on macosx: HDFS parts (Binglin Chang via aw)	2014-09-24 08:22:02 -07:00
config.h.cmake	HDFS-6287. Add vecsum test of libhdfs read access times (cmccabe)	2014-05-15 00:29:41 +00:00