Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-9334. Merge change 1450463 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450475 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-02-26 22:02:30 +00:00
parent c215e12419
commit 6485664b15
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -21,6 +21,8 @@ Release 2.0.4-beta - UNRELEASED
HADOOP-9279. Document the need to build hadoop-maven-plugins for HADOOP-9279. Document the need to build hadoop-maven-plugins for
eclipse and separate project builds. (Tsuyoshi Ozawa via suresh) eclipse and separate project builds. (Tsuyoshi Ozawa via suresh)
HADOOP-9334. Upgrade netty version. (Nicolas Liochon via suresh)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

2
hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
View File

@ -130,7 +130,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
</dependency> </dependency>
<dependency> <dependency>

4
hadoop-mapreduce-project/pom.xml
View File

@ -61,7 +61,7 @@
<artifactId>ant</artifactId> <artifactId>ant</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.jboss.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
@ -151,7 +151,7 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
</dependency> </dependency>
<dependency> <dependency>

4
hadoop-project/pom.xml
View File

@ -393,9 +393,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
<version>3.2.4.Final</version> <version>3.5.11.Final</version>
</dependency> </dependency>
<dependency> <dependency>

2
hadoop-yarn-project/hadoop-yarn/pom.xml
View File

@ -85,7 +85,7 @@
<artifactId>guice-servlet</artifactId> <artifactId>guice-servlet</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
</dependency> </dependency>
<dependency> <dependency>

4
hadoop-yarn-project/pom.xml
View File

@ -59,7 +59,7 @@
<artifactId>ant</artifactId> <artifactId>ant</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.jboss.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
@ -149,7 +149,7 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
</dependency> </dependency>
<dependency> <dependency>