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	Revert 1164192 given review feedback provided after initial commit.	2011-09-01 18:25:51 +00:00
hadoop-hdfs	Merge trunk into branch.	2011-12-05 22:10:35 +00:00
pom.xml	Preparing for hadoop-0.24.0 development.	2011-08-25 20:32:04 +00:00