f39aac60e0
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 |
||
---|---|---|
dev-support | ||
hadoop-assemblies | ||
hadoop-common-project | ||
hadoop-dist | ||
hadoop-hdfs-project | ||
hadoop-mapreduce-project | ||
hadoop-project | ||
hadoop-project-dist | ||
hadoop-tools | ||
.gitignore | ||
BUILDING.txt | ||
pom.xml |