Backport of HDFS-3629 from trunk. svn merge -c 1359905 ../../trunk (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359906 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6d100d340c
commit
6df36b322b
|
@ -115,6 +115,9 @@ Release 2.0.1-alpha - UNRELEASED
|
|||
|
||||
HDFS-3568. fuse_dfs: add support for security. (Colin McCabe via atm)
|
||||
|
||||
HDFS-3629. Fix the typo in the error message about inconsistent
|
||||
storage layout version. (Brandon Li via harsh)
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
HDFS-2982. Startup performance suffers when there are many edit log
|
||||
|
|
|
@ -1103,7 +1103,7 @@ public class NNStorage extends Storage implements Closeable {
|
|||
}
|
||||
if (multipleLV) {
|
||||
throw new IOException(
|
||||
"Storage directories containe multiple layout versions: "
|
||||
"Storage directories contain multiple layout versions: "
|
||||
+ layoutVersions);
|
||||
}
|
||||
// If the storage directories are with the new layout version
|
||||
|
|
Loading…
Reference in New Issue