GitHub user tianrobin opened a pull request:

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

    merge Request

    merge from 

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

    $ git pull https://github.com/tianrobin/zookeeper trunk

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

    https://github.com/apache/zookeeper/pull/226.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 #226
    
----
commit e67eea5425615b03dc72b9e168e1b41079dbf18c
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-05T21:53:40Z

    ZOOKEEPER-1779. ReconfigTest littering the source root with test files 
(Abhiraj Butala via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1574686 
13f79535-47bb-0310-9956-ffa450edef68

commit af97461973e25ba998f8dfdd89466004de247370
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-10T23:28:19Z

    ZOOKEEPER-1888. ZkCli.cmd commands fail with "'java' is not recognized as 
an internal or external command" (Ivan Mitic via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1576127 
13f79535-47bb-0310-9956-ffa450edef68

commit 8b589874f6bf718986b8f2e04f7776906ded6a85
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-11T01:44:30Z

    ZOOKEEPER-1662. Fix to two small bugs in ReconfigTest.testPortChange() 
(Alexander Shraer via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1576174 
13f79535-47bb-0310-9956-ffa450edef68

commit c1dcbb8a8fff0b415a1e6969894cd78cce9eb473
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-12T21:44:20Z

    ZOOKEEPER-1440. Spurious log error messages when QuorumCnxManager is 
shutting down (Jordan Zimmerman via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1576936 
13f79535-47bb-0310-9956-ffa450edef68

commit 52fd73bee5c4e5b325ca6704e12b33520b7d208b
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-12T22:25:14Z

    ZOOKEEPER-1883. C client unit test failures (Raul Gutierrez Segales via 
michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1576961 
13f79535-47bb-0310-9956-ffa450edef68

commit 410a82ba0eda200bb44fdbbf8ce93599b00c3678
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-12T22:57:11Z

    ZOOKEEPER-1638. Redundant zk.getZKDatabase().clear(); (neil bhakta via 
michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1576982 
13f79535-47bb-0310-9956-ffa450edef68

commit 8ba172034040e67b76bbc2b2334cbb11afd2378e
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-13T01:39:14Z

    Revert "ZOOKEEPER-1883. C client unit test failures (Raul Gutierrez Segales 
via michim)"
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1577019 
13f79535-47bb-0310-9956-ffa450edef68

commit 8293410d7bd636af3af3237d578a584ffb946be5
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-13T20:58:01Z

    ZOOKEEPER-1883. C client unit test failures (Raul Gutierrez Segales via 
michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1577317 
13f79535-47bb-0310-9956-ffa450edef68

commit a386f2779b5a5fb70a58be00873311357207da58
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-14T22:51:29Z

    KEEPER-1878. Inconsistent behavior in autocreation of dataDir and 
dataLogDir (Rakesh R via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1577750 
13f79535-47bb-0310-9956-ffa450edef68

commit 68a0744187dd0cfe6384511747227590ca427b49
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-14T23:10:35Z

    ZOOKEEPER-1862. ServerCnxnTest.testServerCnxnExpiry is intermittently 
failing (Rakesh R via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1577756 
13f79535-47bb-0310-9956-ffa450edef68

commit 4171a539774616297cd71db930a30791cf63d476
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-21T05:36:11Z

    ZOOKEEPER-1796. Move common code from {Follower, Observer}ZooKeeperServer 
into LearnerZooKeeperServer (Raul Gutierrez Segales via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1579888 
13f79535-47bb-0310-9956-ffa450edef68

commit 087abf83684167ae56864fe4c3be0079fa653266
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-23T03:12:56Z

    ZOOKEEPER-602. log all exceptions not caught by ZK threads (Rakesh R via 
michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1580436 
13f79535-47bb-0310-9956-ffa450edef68

commit 098dd39d7241638ca379d64176ebd5debd5d6e4a
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-23T21:03:31Z

    ZOOKEEPER-1901. [JDK8] Sort children for comparison in AsyncOps tests 
(Andrew Purtell via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1580612 
13f79535-47bb-0310-9956-ffa450edef68

commit 15c88f0488341bf803058254da5190f0953713fb
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-25T21:13:19Z

    ZOOKEEPER-1263. fix handling of min/max session timeout value 
initialization (Rakesh R via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1581522 
13f79535-47bb-0310-9956-ffa450edef68

commit c52a5aaeb5d0de875c4efac6ae0149885fa6b2da
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-26T21:13:46Z

    ZOOKEEPER-1904. WatcherTest#testWatchAutoResetWithPending is failing 
(Rakesh R via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1582055 
13f79535-47bb-0310-9956-ffa450edef68

commit 1cf687e4e4471c853f5f1123108c9e903a9218ee
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-26T21:25:14Z

    ZOOKEEPER-1878. Reset zookeeper.datadir.autocreate (Rakesh R via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1582067 
13f79535-47bb-0310-9956-ffa450edef68

commit 4cf3f899ba17a1e4d5fefc980de9873105ba230a
Author: Camille Fournier <[email protected]>
Date:   2014-03-28T00:58:20Z

    ZOOKEEPER-1894. ObserverTest.testObserver fails consistently. (michim via 
camille)
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1582572 
13f79535-47bb-0310-9956-ffa450edef68

commit 42b1a4c2dee45c686ad85156ba6ceb59fc369bf8
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-29T03:23:57Z

    ZOOKEEPER-297. centralize version numbering in the source/build (Diego de 
Oliveira via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1582941 
13f79535-47bb-0310-9956-ffa450edef68

commit 4474276df7ae8fc0286cbe2de5e943c5d155020b
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-29T03:33:53Z

    ZOOKEEPER-1408. CLI: sort output of ls command (Hartmut Lang via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1582943 
13f79535-47bb-0310-9956-ffa450edef68

commit b5c25d7ee1b940f919f718032d101c26c46f30b2
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-29T23:01:40Z

    ZOOKEEPER-1219. LeaderElectionSupport recipe is unnecessarily dispatching 
the READY_START event even if the ELECTED node stopped/expired simultaneously. 
(Rakesh R via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1583083 
13f79535-47bb-0310-9956-ffa450edef68

commit fa6d21fa8a8acba812237538e4f7172faf969d37
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-31T23:47:08Z

    ZOOKEEPER-1728. Better error message when reconfig invoked in standalone 
mode (Alexander Shraer via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1583492 
13f79535-47bb-0310-9956-ffa450edef68

commit fcb953e57d5bde313caf91a4a235e19650dbc5f8
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-03-31T23:56:32Z

    ZOOKEEPER-1725. Zookeeper Dynamic Conf writes out hostnames when IPs are 
supplied (Alexander Shraer via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1583495 
13f79535-47bb-0310-9956-ffa450edef68

commit dd417482fe8be7032b8a122052dde2a667d92245
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-04-01T01:45:52Z

    ZOOKEEPER-1701. When new and old config have the same version, no need to 
write new config to disk or create new connections (Alexander Shraer via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1583509 
13f79535-47bb-0310-9956-ffa450edef68

commit c40e8838027cbcb2f9f8cf335436ef35413e3578
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-04-01T02:03:02Z

    ZOOKEEPER-1730. Make ZooKeeper easier to test - support simulating a 
session expiration (Jordan Zimmerman via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1583513 
13f79535-47bb-0310-9956-ffa450edef68

commit 4fa9e3d5df5db1526913176def593b4ca1796c11
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-04-01T20:58:07Z

    ZOOKEEPER-1906. zkpython: invalid data in GetData for empty node (Nikita 
Vetoshkin via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1583783 
13f79535-47bb-0310-9956-ffa450edef68

commit 12cbad0ceddf25668cbaebb7dbbb34d9a13f7876
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-04-03T22:39:16Z

    ZOOKEEPER-1897. ZK Shell/Cli not processing commands (stack via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584438 
13f79535-47bb-0310-9956-ffa450edef68

commit d293c900fb36c76041ea911016894cab7564cab4
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-04-03T23:03:34Z

    ZOOKEEPER-1830. Support command line shell for removing watches (Rakesh R 
via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584454 
13f79535-47bb-0310-9956-ffa450edef68

commit 4530bf4e14b2a75d7d2285be23ef280399f591fd
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-04-03T23:13:29Z

    ZOOKEEPER-1831. Document remove watches details to the guide (Rakesh R via 
michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584459 
13f79535-47bb-0310-9956-ffa450edef68

commit c8297c94e9c9497b5d3f3d9396853df39453d249
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-04-04T01:24:37Z

    Set svn:eol-style property to native.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584497 
13f79535-47bb-0310-9956-ffa450edef68

commit 5d1ed66859ae30f89935721aab0b20004cda62e8
Author: Michi Mutsuzaki <[email protected]>
Date:   2014-04-04T01:33:45Z

    ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatches for 
source and text files (Raja Aluri via michim)
    
    
    git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584501 
13f79535-47bb-0310-9956-ffa450edef68

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to