From 44feec7122f48c6ff6ec1a90347098447b67543b Mon Sep 17 00:00:00 2001 From: "Arun C. Murthy" Date: Wed, 12 Nov 2014 09:55:28 -0800 Subject: [PATCH] HADOOP-9576. Merging to branch-2.6 for hadoop-2.6.0-rc1. --- hadoop-common-project/hadoop-common/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 26c39cf7ed6..480737bcc0b 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