From 8460971241f8aa0be788e7dc1080c2a10c8b95d2 Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Tue, 1 Jul 2014 16:36:19 +0000 Subject: [PATCH] HADOOP-10767. Merging change r1607133 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607134 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../src/main/java/org/apache/hadoop/fs/shell/Ls.java | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 07a37bbf9cf..06528516749 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -120,6 +120,8 @@ Release 2.5.0 - UNRELEASED HADOOP-10649. Allow overriding the default ACL for service authorization (Benoy Antony via Arpit Agarwal) + HADOOP-10767. Clean up unused code in Ls shell command. (cnauroth) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java index edc3b0a8948..6024d885afb 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java @@ -19,21 +19,16 @@ package org.apache.hadoop.fs.shell; import java.io.IOException; -import java.net.URI; import java.text.SimpleDateFormat; import java.util.Date; import java.util.LinkedList; -import java.util.Set; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.FileStatus; -import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import com.google.common.collect.Sets; - /** * Get a listing of all files in that match the file patterns. */ @@ -70,7 +65,6 @@ class Ls extends FsCommand { protected boolean dirRecurse; protected boolean humanReadable = false; - private Set aclNotSupportedFsSet = Sets.newHashSet(); protected String formatSize(long size) { return humanReadable