Tsz-Wo Nicholas Sze 2d2b0009e6 Merge branch 'trunk' into HDFS-6584 ... Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java		2014-09-18 13:00:29 +08:00
..
dev-support	HDFS-6634. inotify in HDFS. Contributed by James Thomas.	2014-09-02 14:02:29 -07:00
src	Merge branch 'trunk' into HDFS-6584	2014-09-18 13:00:29 +08:00
CHANGES.txt	Merge branch 'trunk' into HDFS-6584	2014-09-18 13:00:29 +08:00
pom.xml	HADOOP-11062. CryptoCodec testcases requiring OpenSSL should be run only if -Pnative is used. (asuresh via tucu)	2014-09-16 23:36:36 -07:00