arp eb8284d50e Merge trunk into HDFS-6581 ...

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsVolumeSpi.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java

2014-09-07 14:46:46 -07:00

..

bin

HADOOP-11052. hadoop_verify_secure_prereq's results aren't checked in bin/hdfs (aw)

2014-09-05 11:31:49 -07:00

conf

HDFS-6517. Remove hadoop-metrics2.properties from hdfs project (Akira AJISAKA via aw)

2014-08-06 16:07:52 +00:00

docs

Merge trunk into branch.

2013-03-29 21:33:35 +00:00

java

Merge trunk into HDFS-6581

2014-09-07 14:46:46 -07:00

native

HDFS-573. Porting libhdfs to Windows. Contributed by Chris Nauroth.

2014-08-08 16:26:45 +00:00

proto

Merge trunk into HDFS-6581

2014-09-05 21:36:25 -07:00

resources

Merge trunk into HDFS-6581

2014-09-05 21:36:25 -07:00

webapps

HDFS-6722. Display readable last contact time for dead nodes on NN webUI. Contributed by Ming Ma.

2014-08-08 04:27:47 +00:00

xsl

HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.

2011-08-25 00:14:24 +00:00