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

svn merge -c 1335258 from trunk for HADOOP-8359. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335262 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2012-05-07 21:12:09 +00:00
parent 4fa0dd2278
commit 239fa432d0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -297,6 +297,9 @@ Release 2.0.0 - UNRELEASED
HADOOP-8328. Duplicate FileSystem Statistics object for 'file' scheme. HADOOP-8328. Duplicate FileSystem Statistics object for 'file' scheme.
(tomwhite) (tomwhite)
HADOOP-8359. Fix javadoc warnings in Configuration. (Anupam Seth via
szetszwo)
BREAKDOWN OF HADOOP-7454 SUBTASKS BREAKDOWN OF HADOOP-7454 SUBTASKS
HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh) HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
View File

@ -278,7 +278,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
* @param key * @param key
* @param newKeys * @param newKeys
* @param customMessage * @param customMessage
* @deprecated use {@link addDeprecation(String key, String newKey, * @deprecated use {@link #addDeprecation(String key, String newKey,
String customMessage)} instead String customMessage)} instead
*/ */
@Deprecated @Deprecated
@ -328,7 +328,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
* *
* @param key Key that is to be deprecated * @param key Key that is to be deprecated
* @param newKeys list of keys that take up the values of deprecated key * @param newKeys list of keys that take up the values of deprecated key
* @deprecated use {@link addDeprecation(String key, String newKey)} instead * @deprecated use {@link #addDeprecation(String key, String newKey)} instead
*/ */
@Deprecated @Deprecated
public synchronized static void addDeprecation(String key, String[] newKeys) { public synchronized static void addDeprecation(String key, String[] newKeys) {