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 vi...@apache.org on 2014/11/17 07:30:06 UTC

[04/45] hadoop git commit: HADOOP-9576. Merging to branch-2.6 for hadoop-2.6.0-rc1.

HADOOP-9576. Merging to branch-2.6 for hadoop-2.6.0-rc1.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/44feec71
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/44feec71
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/44feec71

Branch: refs/heads/HDFS-EC
Commit: 44feec7122f48c6ff6ec1a90347098447b67543b
Parents: a041430
Author: Arun C. Murthy <ac...@apache.org>
Authored: Wed Nov 12 09:55:28 2014 -0800
Committer: Arun C. Murthy <ac...@apache.org>
Committed: Wed Nov 12 09:55:28 2014 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/44feec71/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 26c39cf..480737b 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -422,9 +422,6 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11294. Nfs3FileAttributes should not change the values of rdev,
     nlink and size in the constructor. (Brandon Li via wheat9)
 
-    HADOOP-9576. Changed NetUtils#wrapException to throw EOFException instead
-    of wrapping it as IOException. (Steve Loughran via jianhe)
-
 Release 2.6.0 - 2014-11-15
 
   INCOMPATIBLE CHANGES
@@ -1103,6 +1100,9 @@ Release 2.6.0 - 2014-11-15
     HADOOP-11282. Skip NFS TestShellBasedIdMapping tests that are irrelevant on
     Windows. (cnauroth)
 
+    HADOOP-9576. Changed NetUtils#wrapException to throw EOFException instead
+    of wrapping it as IOException. (Steve Loughran via jianhe)
+
 Release 2.5.2 - 2014-11-10
 
   INCOMPATIBLE CHANGES