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

@@ -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

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>