Todd Lipcon 2bf19979b3 Merge trunk into auto-failover branch. ... Needs a few tweaks to fix compilation - will do in followup commit. This is just a straight merge git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3042@1324567 13f79535-47bb-0310-9956-ffa450edef68		2012-04-11 05:47:40 +00:00
..
ant/org/apache/hadoop/ant	HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.	2011-08-25 00:14:24 +00:00
contrib	HDFS-2696. Fix the fuse-fds build. Contributed by Bruno Mahé	2012-04-11 01:55:05 +00:00
main	Merge trunk into auto-failover branch.	2012-04-11 05:47:40 +00:00
test	Merge trunk into auto-failover branch.	2012-04-11 05:47:40 +00:00