From 5f2d286963035a1a6fcc94210517f1e5bcbab4c4 Mon Sep 17 00:00:00 2001 From: Alejandro Abdelnur Date: Thu, 26 Jan 2012 18:00:41 +0000 Subject: [PATCH] Merge -r 1236327:1236328 from trunk to branch. FIXES: HDFS-2836 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236331 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/hadoop/fs/http/server/HttpFSServer.java | 4 ++-- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java index 43a0f07fd4e..b52f2d3d08d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java @@ -219,7 +219,7 @@ public class HttpFSServer { * operation is @link org.apache.hadoop.fs.http.client.HttpFSFileSystem.GetOpValues#LISTSTATUS} * @param doAs user being impersonated, defualt value is none. It can be used * only if the current user is a HttpFSServer proxyuser. - * @param override, default is true. Used only for + * @param override default is true. Used only for * @link org.apache.hadoop.fs.http.client.HttpFSFileSystem.PutOpValues#CREATE} operations. * @param blockSize block size to set, used only by * @link org.apache.hadoop.fs.http.client.HttpFSFileSystem.PutOpValues#CREATE} operations. @@ -419,7 +419,7 @@ public class HttpFSServer { * @link org.apache.hadoop.fs.http.client.HttpFSFileSystem.PutOpValues#SETOWNER} operations. * @param group group to set, used only for * @link org.apache.hadoop.fs.http.client.HttpFSFileSystem.PutOpValues#SETOWNER} operations. - * @param override, default is true. Used only for + * @param override default is true. Used only for * @link org.apache.hadoop.fs.http.client.HttpFSFileSystem.PutOpValues#CREATE} operations. * @param blockSize block size to set, used only by * @link org.apache.hadoop.fs.http.client.HttpFSFileSystem.PutOpValues#CREATE} operations. diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 50d164e9d4a..490800e7705 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -184,6 +184,8 @@ Release 0.23.1 - UNRELEASED HDFS-442. dfsthroughput in test jar throws NPE (harsh) + HDFS-2836. HttpFSServer still has 2 javadoc warnings in trunk (revans2 via tucu) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES