arp 65ef35bbab 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/test/resources/editsStored.xml

2014-09-30 18:20:13 -07: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-6581

2014-09-30 18:20:13 -07:00

CHANGES-HDFS-6581.txt

HDFS-7129. Metrics to track usage of memory for writes. (Contributed by Xiaoyu Yao)

2014-09-30 00:53:18 -07:00

CHANGES.txt

HDFS-7153. Add storagePolicy to NN edit log during file creation. (Arpit Agarwal)

2014-09-30 18:10:13 -07: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