Todd Lipcon db187cf40e Merge trunk into HA branch. ... Some conflicts around TestBlockRecovery: mocking changed for new heartbeat types/responses git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1243691 13f79535-47bb-0310-9956-ffa450edef68		2012-02-13 21:00:37 +00:00
..
src/site	Merge trunk into HA branch.	2012-02-13 21:00:37 +00:00
pom.xml	MAPREDUCE-3199. Fixed pom files to include correct log4j configuration for tests. (vinodkv)	2011-10-19 04:30:27 +00:00