hadoop/hadoop-hdfs-project/hadoop-hdfs
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 JDiff output for release 0.22.0 2011-12-12 05:45:08 +00:00
src Merge trunk into HA branch. 2011-12-14 22:47:41 +00:00
CHANGES.HDFS-1623.txt HDFS-2680. DFSClient should construct failover proxy with exponential backoff. Contributed by Todd Lipcon. 2011-12-14 21:41:31 +00:00
CHANGES.txt Merge trunk into HA branch. 2011-12-14 22:47:41 +00:00
LICENSE.txt HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur. 2011-08-25 00:14:24 +00:00
NOTICE.txt HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur. 2011-08-25 00:14:24 +00:00
pom.xml Merge trunk into HA branch. 2011-12-12 19:41:20 +00:00