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
This commit is contained in:
Thomas Graves 2012-06-18 14:43:51 +00:00
parent 2106c8bec8
commit 5f69497e35
2 changed files with 4 additions and 1 deletions

View File

@ -564,6 +564,9 @@ Release 0.23.3 - UNRELEASED
HADOOP-8373. Port RPC.getServerAddress to 0.23 (Daryn Sharp via bobby) 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 Release 0.23.2 - UNRELEASED
NEW FEATURES NEW FEATURES

View File

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