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 2014/11/13 05:09:38 UTC
hadoop git commit: HDFS-6938. Cleanup javac warnings in FSNamesystem.
Contributed by Charles Lamb.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 7c6f03ba2 -> c18dd3fc5
HDFS-6938. Cleanup javac warnings in FSNamesystem. Contributed by Charles Lamb.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c18dd3fc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c18dd3fc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c18dd3fc
Branch: refs/heads/branch-2
Commit: c18dd3fc5ec302f9e4c892fa506724b1225f26a4
Parents: 7c6f03b
Author: Haohui Mai <wh...@apache.org>
Authored: Wed Aug 27 11:10:30 2014 -0700
Committer: Haohui Mai <wh...@apache.org>
Committed: Wed Nov 12 20:06:25 2014 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 1 -
.../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 7 -------
2 files changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c18dd3fc/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index ef1ae2a..88353b9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1301,7 +1301,6 @@ Release 2.5.2 - 2014-11-10
HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha)
-
Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c18dd3fc/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index beb66af..1514245 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -109,7 +109,6 @@ import java.lang.management.ManagementFactory;
import java.net.InetAddress;
import java.net.URI;
import java.security.GeneralSecurityException;
-import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -123,7 +122,6 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
@@ -521,9 +519,6 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
private final NNConf nnConf;
private KeyProviderCryptoExtension provider = null;
- private KeyProvider.Options providerOptions = null;
-
- private final CryptoCodec codec;
private volatile boolean imageLoaded = false;
private final Condition cond;
@@ -744,8 +739,6 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
} else {
LOG.info("Found KeyProvider: " + provider.toString());
}
- providerOptions = KeyProvider.options(conf);
- this.codec = CryptoCodec.getInstance(conf);
if (conf.getBoolean(DFS_NAMENODE_AUDIT_LOG_ASYNC_KEY,
DFS_NAMENODE_AUDIT_LOG_ASYNC_DEFAULT)) {
LOG.info("Enabling async auditlog");