Todd Lipcon 30068a1d83 Merge trunk into auto-failover branch. ... Addressed two semantic conflicts after the commit of HADOOP-8077 -- test code was referencing the old constant for the fencing methods config key. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1310174 13f79535-47bb-0310-9956-ffa450edef68		2012-04-06 05:07:33 +00:00
..
aop	HDFS-3148. The client should be able to use multiple local interfaces for data transfer. Contributed by Eli Collins	2012-04-02 23:13:06 +00:00
java/org/apache/hadoop	Merge trunk into auto-failover branch.	2012-04-06 05:07:33 +00:00
resources	HDFS-3050. rework OEV to share more code with the NameNode. Contributed by Colin Patrick McCabe	2012-04-05 00:02:11 +00:00
system	HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.	2011-08-25 00:14:24 +00:00
unit/org/apache/hadoop/hdfs/server	HDFS-2878. Fix TestBlockRecovery and move it back into main test directory. Contributed by Todd Lipcon.	2012-02-11 01:20:59 +00:00