Todd Lipcon 8134b1c870 Merge trunk into HA branch. ... Several conflicts around introduction of protobuf translator for DatanodeProtocol - mostly trivial resolutions. NB: this does not successfully pass any tests since the HAStatus field needs to be integrated into the HeartbeatResponse Protobuf implementation. That will be a separate commit for clearer history. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214518 13f79535-47bb-0310-9956-ffa450edef68		2011-12-14 22:47:41 +00:00
..
dev-support	Revert 1164192 given review feedback provided after initial commit.	2011-09-01 18:25:51 +00:00
hadoop-hdfs	Merge trunk into HA branch.	2011-12-14 22:47:41 +00:00
hadoop-hdfs-httpfs	HDFS-2178. Contributing Hoop to HDFS, replacement for HDFS proxy with read/write capabilities. (tucu)	2011-12-08 19:25:28 +00:00
pom.xml	HDFS-2178. Contributing Hoop to HDFS, replacement for HDFS proxy with read/write capabilities. (tucu)	2011-12-08 19:25:28 +00:00