HDFS-1409. Merge -c 1134444 from trunk to branch 0.22.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/branch-0.22@1134445 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index b81aaf2..0e16c1d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -263,6 +263,10 @@
HDFS-1954. Improved corrupt files warning on NameNode web UI.
(Patrick Hunt via shv)
+ HDFS-1409. BackupNode registration throwing
+ UnsupportedActionException("register") instead of "journal".
+ (Ching-Shen Chen via shv)
+
OPTIMIZATIONS
HDFS-1140. Speedup INode.getPathComponents. (Dmytro Molkov via shv)
diff --git a/src/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java b/src/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java
index 3069fca..e1c19a1 100644
--- a/src/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java
+++ b/src/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java
@@ -182,7 +182,7 @@
@Override // NamenodeProtocol
public NamenodeRegistration register(NamenodeRegistration registration
) throws IOException {
- throw new UnsupportedActionException("journal");
+ throw new UnsupportedActionException("register");
}
@Override // NamenodeProtocol
