From 5eebedb9740974791b140fd5dd65b629201a6df8 Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Fri, 17 Aug 2012 23:27:50 +0000 Subject: [PATCH] HADOOP-8710. Remove ability for users to easily run the trash emptier. Contributed by Eli Collins git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374477 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../src/main/java/org/apache/hadoop/fs/Trash.java | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 0ab200c8c20..619f990dc7f 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -9,6 +9,8 @@ Release 2.0.1-alpha - UNRELEASED HADOOP-8689. Make trash a server side configuration option. (eli) + HADOOP-8710. Remove ability for users to easily run the trash emptier. (eli) + NEW FEATURES HDFS-3042. Automatic failover support for NameNode HA (todd) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java index 76033eaa6f2..56ccac3b9c8 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java @@ -117,9 +117,4 @@ public class Trash extends Configured { public Runnable getEmptier() throws IOException { return trashPolicy.getEmptier(); } - - /** Run an emptier.*/ - public static void main(String[] args) throws Exception { - new Trash(new Configuration()).getEmptier().run(); - } }