Todd Lipcon 1ba357553a Merge trunk into HA branch. ... Resolved some semantic conflicts in TestFileAppendRestart - we now log more OP_ADDs in the HA branch than we did in trunk. Resolved some conflicts around removal of VersionedProtocol, etc. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295342 13f79535-47bb-0310-9956-ffa450edef68		2012-02-29 23:47:49 +00:00
..
src/site	Merge trunk into HA branch.	2012-02-29 23:47:49 +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