From 5f69497e355b7f6639d740965658e3ed1d9f95c4 Mon Sep 17 00:00:00 2001
From: Thomas Graves <tgraves@apache.org>
Date: Mon, 18 Jun 2012 14:43:51 +0000
Subject: [PATCH] merge -r 1351362:1351363 from trunk. FIXES: HADOOP-8495

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351364 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 hadoop-project/pom.xml                          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index f54090a40fb..ebcdd428998 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -564,6 +564,9 @@ Release 0.23.3 - UNRELEASED
 
     HADOOP-8373. Port RPC.getServerAddress to 0.23 (Daryn Sharp via bobby)
 
+    HADOOP-8495. Update Netty to avoid leaking file descriptors during shuffle
+    (Jason Lowe via tgraves)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index f3b9ea8d69e..ca783d4306f 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -383,7 +383,7 @@
       <dependency>
         <groupId>org.jboss.netty</groupId>
         <artifactId>netty</artifactId>
-        <version>3.2.3.Final</version>
+        <version>3.2.4.Final</version>
       </dependency>
 
       <dependency>