GitHub user xoiss opened a pull request:

    https://github.com/apache/zookeeper/pull/358

    branch-3.4 -- bugfix -- ZOOKEEPER-2890

    Fixes https://issues.apache.org/jira/browse/ZOOKEEPER-2890

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/xoiss/zookeeper 
branch-3.4-bugfix-zookeeper-2890

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/zookeeper/pull/358.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #358
    
----
commit a752eee7837d241d79151fa6053571df7a00761e
Author: Patrick D. Hunt <ph...@apache.org>
Date:   2013-10-24T05:11:59Z

    ZOOKEEPER-1744. clientPortAddress breaks "zkServer.sh status" (Nick Ohanian 
via phunt)
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1535279 
13f79535-47bb-0310-9956-ffa450edef68

commit 3dae9c4770f77e28fa6bba07e58133f1530f381a
Author: Thawan Kooburat <tha...@apache.org>
Date:   2013-10-24T18:52:31Z

    ZOOKEEPER-1798. Fix race condition in testNormalObserverRun (thawan, fpj 
via thawan)
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1535497 
13f79535-47bb-0310-9956-ffa450edef68

commit 2bdf4678c70ff7639761c459708922cb2309b078
Author: Patrick D. Hunt <ph...@apache.org>
Date:   2013-11-12T06:30:06Z

    ZOOKEEPER-1812. ZooInspector reconnection always fails if first connection 
fails (Benjamin Jaton via phunt)
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1540960 
13f79535-47bb-0310-9956-ffa450edef68

commit ffd23df5f0f5038bee5c3b05f54f12a80f8098b1
Author: Camille Fournier <cami...@apache.org>
Date:   2013-11-13T02:22:39Z

    ZOOKEEPER-1666. Avoid Reverse DNS lookup if the hostname in 
      connection string is literal IP address. (George Cao via camille)
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1541359 
13f79535-47bb-0310-9956-ffa450edef68

commit bf1814b9943588ac25b46aa158d994f5900b9202
Author: Thawan Kooburat <tha...@apache.org>
Date:   2013-11-14T04:43:46Z

    ZOOKEEPER-1798. Fix race condition in testNormalObserverRun (Part 2) 
(thawan, fpj via thawan)
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1541814 
13f79535-47bb-0310-9956-ffa450edef68

commit 6503f12e144bc6b0652f7adf558bdc28c984e6c0
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-11-15T18:12:07Z

    ZOOKEEPER-1786. ZooKeeper data model documentation is incorrect
      (Niraj Tolia via fpj)
    
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1542356 
13f79535-47bb-0310-9956-ffa450edef68

commit a452d791cff92d65937142c3475a9894264376f6
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-11-16T10:06:19Z

    ZOOKEEPER-1808. Add version to FLE notifications for 3.4 branch (fpj)
    
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1542489 
13f79535-47bb-0310-9956-ffa450edef68

commit b770aeb0c8bcb28a9b653b1dc0edac623c75b509
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-11-17T11:42:22Z

    ZOOKEEPER-1597. Windows build failing (michim via fpj)
    
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1542710 
13f79535-47bb-0310-9956-ffa450edef68

commit 7f069c0e084a74f6de661267b828ff3fde30bd11
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-11-23T18:21:38Z

    ZOOKEEPER-1817. Fix don't care for b3.4 (fpj)
    
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1544858 
13f79535-47bb-0310-9956-ffa450edef68

commit c62f2ffa7b9fb026004f66d788ebf1e293d2fdf8
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-11-26T23:43:29Z

    ZOOKEEPER-1653. zookeeper fails to start because of inconsistent epoch 
(michim via fpj)
    
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1545883 
13f79535-47bb-0310-9956-ffa450edef68

commit 605c8d1b0db0baa57582bb39229c80bfec832ae3
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-11-27T23:23:11Z

    ZOOKEEPER-1821. very ugly warning when compiling load_gen.c (german blanco 
via fpj)
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1546231 
13f79535-47bb-0310-9956-ffa450edef68

commit a1cdea63de42ed1eaba224570ad0304c224b21c1
Author: Michi Mutsuzaki <mic...@apache.org>
Date:   2013-12-04T04:20:53Z

    ZOOKEEPER-1632. fix memory leaks in cli_st (fpj via michim)
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1547703 
13f79535-47bb-0310-9956-ffa450edef68

commit f23b85bde1bf53b284a85a8ec6c6251cd63e9feb
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-12-07T10:17:54Z

    ZOOKEEPER-1459. Standalone ZooKeeperServer is not closing 
      the transaction log files on shutdown (Rakesh R via fpj)
    
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1548826 
13f79535-47bb-0310-9956-ffa450edef68

commit 4822626f958742baf98303fd9cdfcb51ce95cb46
Author: Michi Mutsuzaki <mic...@apache.org>
Date:   2013-12-10T20:43:22Z

    ZOOKEEPER-1019. zkfuse doesn't list dependency on boost in README (Raul 
Gutierrez Segales via michim)
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1549963 
13f79535-47bb-0310-9956-ffa450edef68

commit b666d3bccc2e8a0851c4b68024a4c3ac2d97713c
Author: Michi Mutsuzaki <mic...@apache.org>
Date:   2013-12-11T00:12:53Z

    ZOOKEEPER-1834. Catch IOException in FileTxnLog (fpj via michim)
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1550006 
13f79535-47bb-0310-9956-ffa450edef68

commit 63b1f92102877757815eec5e0866b7a143868e2d
Author: Camille Fournier <cami...@apache.org>
Date:   2013-12-11T18:31:05Z

    ZOOKEEPER-1382. Zookeeper server holds onto dead/expired session ids in the 
watch data structures
      (Germán Blanco and Michael Morello via camille)
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1550220 
13f79535-47bb-0310-9956-ffa450edef68

commit fc22886f0c12c0b28780dc29a10c334d1221d9b9
Author: Michi Mutsuzaki <mic...@apache.org>
Date:   2013-12-14T08:36:46Z

    ZOOKEEPER-1715. Upgrade netty version (Sean Bridges via michim)
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1550902 
13f79535-47bb-0310-9956-ffa450edef68

commit ec70dd2c43bc1d780a480487fe4437cb95d01e65
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-12-14T11:23:24Z

    ZOOKEEPER-1837. Fix JMXEnv checks (potential race conditions) (Germán 
Blanco via fpj)
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1550923 
13f79535-47bb-0310-9956-ffa450edef68

commit 7e1c76814a267d52c4392c7c181e116b3eb31233
Author: Michi Mutsuzaki <mic...@apache.org>
Date:   2013-12-16T04:20:40Z

    ZOOKEEPER-1839. Deadlock in NettyServerCnxn (Rakesh R via michim)
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1551112 
13f79535-47bb-0310-9956-ffa450edef68

commit a6dec3afdae22bafd8e8fd3c56b258b2a3bbabe8
Author: Patrick D. Hunt <ph...@apache.org>
Date:   2013-12-16T06:27:56Z

    ZOOKEEPER-1622. session ids will be negative in the year 2022 (Eric Newton 
via phunt)
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1551118 
13f79535-47bb-0310-9956-ffa450edef68

commit 5dd0361a5db1e2a5f998344c8abdd0751988eba1
Author: Michi Mutsuzaki <mic...@apache.org>
Date:   2013-12-16T21:49:50Z

    ZOOKEEPER-1756. zookeeper_interest() in C client can return a timeval of 0 
(Eric Lindvall via michim)
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1551367 
13f79535-47bb-0310-9956-ffa450edef68

commit 6c483a2d67d4aee937e0f4873e4b410b7008e703
Author: Patrick D. Hunt <ph...@apache.org>
Date:   2013-12-17T16:57:03Z

    ZOOKEEPER-1388. Client side 'PathValidation' is missing for the 
multi-transaction api. (Rakesh R via marshallm, phunt)
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1551625 
13f79535-47bb-0310-9956-ffa450edef68

commit 54eefdb4fc57e18f28bbb520e4abb163de2f936a
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-12-18T13:05:31Z

    ZOOKEEPER-1841. problem in QuorumTest (Germán via fpj)
    
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1551930 
13f79535-47bb-0310-9956-ffa450edef68

commit 5420ead4bb71dfa83f09c4cce72fa72e649eac62
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-12-18T15:48:19Z

    ZOOKEEPER-1733. FLETest#testLE is flaky on windows boxes 
      (michim via fpj)
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1551985 
13f79535-47bb-0310-9956-ffa450edef68

commit 058185d6359393e3898acd745f341f1799b276ce
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-12-18T15:52:16Z

    ZOOKEEPER-1733. FLETest#testLE is flaky on windows boxes
      (michim, Jeffrey Zhong via fpj)
    
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1551987 
13f79535-47bb-0310-9956-ffa450edef68

commit 7b272f5d5e4d1c170bc72c9b79a462517c06d6d4
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-12-19T22:36:08Z

    ZOOKEEPER-1849. Need to properly tear down tests in various 
      cases (Germán via fpj)
    
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1552447 
13f79535-47bb-0310-9956-ffa450edef68

commit 05bc123a83d0e355f703001c78b3a54988c678e4
Author: Patrick D. Hunt <ph...@apache.org>
Date:   2013-12-20T01:29:22Z

    ZOOKEEPER-1430. add maven deploy support to the build (Giridharan Kesavan 
via phunt)
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1552470 
13f79535-47bb-0310-9956-ffa450edef68

commit 7fc3de3a05c9ace88b0e6b914750b2712f43f7c0
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-12-27T13:29:08Z

    ZOOKEEPER-1179. NettyServerCnxn does not properly close 
      socket on 4 letter word requests (Rakesh R, Germán Blanco 
      via fpj)
    
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1553672 
13f79535-47bb-0310-9956-ffa450edef68

commit 80ef32504a46387e051ca9b58e1b5b58b387b358
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2013-12-27T16:50:46Z

    ZOOKEEPER-1179. NettyServerCnxn does not properly close socket on 4 letter 
word requests. (Rakesh R, Germán Blanco via fpj)
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1553694 
13f79535-47bb-0310-9956-ffa450edef68

commit 68a0f7315d59f4a8090b3a08bb8dab8453bb2fe9
Author: Flavio Paiva Junqueira <f...@apache.org>
Date:   2014-01-03T00:23:23Z

    ZOOKEEPER-1852. ServerCnxnFactory instance is not properly cleanedup 
(Rakesh R via fpj)
    
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1554979 
13f79535-47bb-0310-9956-ffa450edef68

----


---

Reply via email to