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

HADOOP-9555. Merging change r1601709 from trunk to branch-2.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601713 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2014-06-10 18:05:22 +00:00
parent 91c53d97bd
commit 74a6db7b27
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,10 @@ Release 2.5.0 - UNRELEASED
HADOOP-10448. Support pluggable mechanism to specify proxy user settings.
(Benoy Antony via Arpit Agarwal)
HADOOP-9555. HA functionality that uses ZooKeeper may experience inadvertent
TCP RST and miss session expiration event due to bug in client connection
management. (cnauroth)
OPTIMIZATIONS
BUG FIXES

6
hadoop-project/pom.xml
View File

@ -65,6 +65,8 @@
<!-- define the protobuf JAR version -->
<protobuf.version>2.5.0</protobuf.version>
<protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path>
<zookeeper.version>3.4.6</zookeeper.version>
</properties>
<dependencyManagement>
@ -691,7 +693,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.4.5</version>
<version>${zookeeper.version}</version>
<exclusions>
<exclusion>
<!-- otherwise seems to drag in junit 3.8.1 via jline -->
@ -715,7 +717,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.4.5</version>
<version>${zookeeper.version}</version>
<type>test-jar</type>
<scope>test</scope>
<exclusions>