From 5e72bfc521b1525b6232f2e685d57bb2dee95823 Mon Sep 17 00:00:00 2001 From: Colin McCabe Date: Fri, 14 Jun 2013 21:23:23 +0000 Subject: [PATCH] revert HADOOP-9646 to fix hadoop-streaming compile issue git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493252 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 b5b9f035dae..b0eb86f24bd 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -372,9 +372,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 075fea1e92a..cb216e96ef8 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 @@ -800,7 +800,7 @@ public class FileUtil { * @throws InterruptedException */ public static int chmod(String filename, String perm - ) throws IOException { + ) throws IOException, InterruptedException { return chmod(filename, perm, false); }