Todd Lipcon f39aac60e0 Merge trunk into branch. ... Resolved conflicts generated by commit of HDFS-1580 in trunk: - made EditLogInputStream.isInProgress public - fixed trivial conflict in DFSConfigKeys git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1210666 13f79535-47bb-0310-9956-ffa450edef68		2011-12-05 22:10:35 +00:00
..
dev-support	HADOOP-7578. Fix test-patch to be able to run on MR patches. (mahadev and tom white)	2011-08-25 19:31:02 +00:00
src	Merge trunk into branch.	2011-12-05 22:10:35 +00:00
CHANGES.HDFS-1623.txt	HDFS-2625. TestDfsOverAvroRpc failing after introduction of HeartbeatResponse type. Contributed by Todd Lipcon.	2011-12-05 06:38:52 +00:00
CHANGES.txt	Merge trunk into branch.	2011-12-05 22:10:35 +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-11-02 05:34:31 +00:00