merge -r 1351363:1351364 from branch-2. FIXES: HADOOP-8495

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1351365 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -71,6 +71,9 @@ Release 0.23.3 - UNRELEASED
     HADOOP-8501. Gridmix fails to compile on OpenJDK7u4 
     (Radim Kolar via tgraves)
 
+    HADOOP-8495. Update Netty to avoid leaking file descriptors during shuffle
+    (Jason Lowe via tgraves)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

hadoop-project/pom.xml

@@ -377,7 +377,7 @@
       <dependency>
         <groupId>org.jboss.netty</groupId>
         <artifactId>netty</artifactId>
-        <version>3.2.3.Final</version>
+        <version>3.2.4.Final</version>
       </dependency>
 
       <dependency>