Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-5833. Merging r1561938 from trunk to branch-2 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561939 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Agarwal 2014-01-28 05:12:36 +00:00
parent a6acbd2403
commit 17acadd167
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -869,6 +869,8 @@ Release 2.3.0 - UNRELEASED
IllegalArgumentException when accessing another cluster. (Yongjun Zhang via IllegalArgumentException when accessing another cluster. (Yongjun Zhang via
Colin Patrick McCabe) Colin Patrick McCabe)
HDFS-5833. Fix SecondaryNameNode javadoc. (Bangtao Zhou via Arpit Agarwal)
Release 2.2.0 - 2013-10-13 Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
View File

@ -90,7 +90,7 @@ import com.google.common.collect.ImmutableList;
* The Secondary NameNode is a daemon that periodically wakes * The Secondary NameNode is a daemon that periodically wakes
* up (determined by the schedule specified in the configuration), * up (determined by the schedule specified in the configuration),
* triggers a periodic checkpoint and then goes back to sleep. * triggers a periodic checkpoint and then goes back to sleep.
* The Secondary NameNode uses the ClientProtocol to talk to the * The Secondary NameNode uses the NamenodeProtocol to talk to the
* primary NameNode. * primary NameNode.
* *
**********************************************************/ **********************************************************/