From efd12d9d3b2e183a1fdc69a07423b9146697e775 Mon Sep 17 00:00:00 2001 From: Colin McCabe Date: Fri, 14 Jun 2013 21:22:41 +0000 Subject: [PATCH] revert HADOOP-9646 to fix hadoop-streaming compile issue git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493251 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 --- .../src/main/java/org/apache/hadoop/fs/FileUtil.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 672a0278f3f..729fee3a520 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -44,9 +44,6 @@ Release 2.1.0-beta - UNRELEASED HADOOP-9630. [RPC v9] Remove IpcSerializationType. (Junping Du via llu) - HADOOP-9646. Inconsistent exception specifications in FileUtils#chmod - (Colin Patrick McCabe) - NEW FEATURES HADOOP-9283. Add support for running the Hadoop client on AIX. (atm) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java index 9178844b315..e24f445245c 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java @@ -728,7 +728,7 @@ public static int symLink(String target, String linkname) throws IOException{ * @throws InterruptedException */ public static int chmod(String filename, String perm - ) throws IOException { + ) throws IOException, InterruptedException { return chmod(filename, perm, false); }