You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wh...@apache.org on 2015/06/24 07:30:29 UTC
hadoop git commit: Addendum patch for HDFS-6564.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 77609e646 -> 0cd7603bd
Addendum patch for HDFS-6564.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0cd7603b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0cd7603b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0cd7603b
Branch: refs/heads/branch-2
Commit: 0cd7603bd6eb23ca62bfa9d51fa57e8d487d0b31
Parents: 77609e6
Author: Haohui Mai <wh...@apache.org>
Authored: Tue Jun 23 22:30:18 2015 -0700
Committer: Haohui Mai <wh...@apache.org>
Committed: Tue Jun 23 22:30:27 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java | 2 +-
.../org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0cd7603b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
index 4a01420..08751d9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
@@ -208,7 +208,7 @@ public class WebHdfsFileSystem extends FileSystem
}
/** Is WebHDFS enabled in conf? */
- public static boolean isEnabled(final Configuration conf, final Log log) {
+ public static boolean isEnabled(final Configuration conf) {
final boolean b = conf.getBoolean(
HdfsClientConfigKeys.DFS_WEBHDFS_ENABLED_KEY,
HdfsClientConfigKeys.DFS_WEBHDFS_ENABLED_DEFAULT);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0cd7603b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
index 72f1a35..b1bb4ce 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
@@ -68,7 +68,7 @@ public class NameNodeHttpServer {
}
private void initWebHdfs(Configuration conf) throws IOException {
- if (WebHdfsFileSystem.isEnabled(conf, HttpServer2.LOG)) {
+ if (WebHdfsFileSystem.isEnabled(conf)) {
// set user pattern based on configuration file
UserParam.setUserPattern(conf.get(
DFSConfigKeys.DFS_WEBHDFS_USER_PATTERN_KEY,