Tsz-Wo Nicholas Sze f1432e2424 Merge branch 'trunk' into HDFS-6584 ...

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java

2014-09-08 10:54:48 +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-08 10:54:48 +08:00

CHANGES.txt

Merge branch 'trunk' into HDFS-6584

2014-09-08 10:54:48 +08:00

pom.xml

HDFS-6979. hdfs.dll not produce .pdb files. Contributed by Chris Nauroth.

2014-09-05 13:50:42 -07:00