GitHub user fairliang opened a pull request: https://github.com/apache/zookeeper/pull/86
zookeeper pull You can merge this pull request into a Git repository by running: $ git pull https://github.com/fairliang/zookeeper trunk Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zookeeper/pull/86.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 #86 ---- commit 5d1ed66859ae30f89935721aab0b20004cda62e8 Author: Michi Mutsuzaki <mic...@apache.org> 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 commit fa7bd96dcac6b41dfb09cedb6208232ea1f95a68 Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-04-07T01:30:49Z Revert "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@1585371 13f79535-47bb-0310-9956-ffa450edef68 commit 644542390d75af0b752ab34fde0ccbf995bb05cf Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-04-10T03:20:17Z zkEnv.cmd: Set svn:eol-style property to 'native'. git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1586200 13f79535-47bb-0310-9956-ffa450edef68 commit 94880dd88002dc37deaedd72bb08fe9b705bcbe8 Author: Michi Mutsuzaki <mic...@apache.org = michim = michi mutsuzaki mic...@apache.org@apache.org> Date: 2014-04-14T21:51:55Z ZOOKEEPER-1357. Zab1_0Test uses hard-wired port numbers. Specifically, it uses the same port for leader in two different tests. The second test periodically fails complaining that the port is still in use. (Alexander Shraer via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1587335 13f79535-47bb-0310-9956-ffa450edef68 commit 03218f40e396949fe007c276ba837ec78a3de2a1 Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-04-16T06:15:28Z ZOOKEEPER-1887. C implementation of removeWatches (Raul Gutierrez Segales via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1587812 13f79535-47bb-0310-9956-ffa450edef68 commit 0ff0c6c8d3cf4f792d4e931e5a3aee561f634082 Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-04-16T07:06:54Z ZOOKEEPER-1840. Server tries to connect to itself during dynamic reconfig (Alexander Shraer via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1587818 13f79535-47bb-0310-9956-ffa450edef68 commit 68fe08a80e0896967d536f87fffb0b7f89846b73 Author: rakeshr <rakeshr@unknown> Date: 2014-04-17T06:47:18Z ZOOKEEPER-1909. removeWatches doesn't return NOWATCHER when there is no watch set (Raul Gutierrez Segales via rakeshr) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1588141 13f79535-47bb-0310-9956-ffa450edef68 commit 41485978bd15bf564a6e0fab18c6b700a821c6a6 Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-04-18T22:31:53Z ZOOKEEPER-1913. Invalid manifest files due to bogus revision property value (Raul Gutierrez Segales via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1588584 13f79535-47bb-0310-9956-ffa450edef68 commit e1e729d049b18646676dfe66d6040885660afb67 Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-04-25T08:10:04Z ZOOKEEPER-1911. REST contrib module does not include all required files when packaged (Sean Mackrory via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1589949 13f79535-47bb-0310-9956-ffa450edef68 commit 1173dd1aa53e2039ed5b5a054c3bd1b40f8a22e1 Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-04-25T19:35:56Z ZOOKEEPER-1819. DeserializationPerfTest calls method with wrong arguments (Daniel Knightly via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1590116 13f79535-47bb-0310-9956-ffa450edef68 commit 2c28538728b1c865230119ab4de86904f96ca906 Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-04-25T21:40:28Z ZOOKEEPER-1673. Zookeeper don't support cidr in expression in ACL with ip scheme (Craig Condit via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1590157 13f79535-47bb-0310-9956-ffa450edef68 commit 769b232c5f6807ec4ccd954da3a67936f36d810a Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-04-26T21:16:37Z ZOOKEEPER-1843. Oddity in ByteBufferInputStream skip (Bill Havanki via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1590298 13f79535-47bb-0310-9956-ffa450edef68 commit f1a095f93b2ec4c4d3073c43cc05aebab7661b99 Author: Camille Fournier <cami...@apache.org> Date: 2014-04-29T00:23:58Z ZOOKEEPER-1910. RemoveWatches wrongly removes the watcher if multiple watches exists on a path (Rakesh R via camille) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1590850 13f79535-47bb-0310-9956-ffa450edef68 commit 6bb891c1c2652e65508b8146fdf69e0a9d5775fc Author: Rakesh Radhakrishnan <rake...@apache.org> Date: 2014-04-30T02:30:23Z ZOOKEEPER-1695. Inconsistent error code and type for new errors introduced by dynamic reconfiguration (Michi Mutsuzaki via rakeshr) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1591175 13f79535-47bb-0310-9956-ffa450edef68 commit 12b0452376ad3ee70e93d0d2c0495fdafaf1b660 Author: Rakesh Radhakrishnan <rake...@apache.org> Date: 2014-05-04T12:36:12Z ZOOKEEPER-751. Recipe heading refers to 'recoverable' but should be 'revocable' (Michi Mutsuzaki via rakeshr) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1592341 13f79535-47bb-0310-9956-ffa450edef68 commit f00c02ccc426db07edd2ea33c4b5d679e9b02963 Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-05-08T21:45:57Z ZOOKEEPER-1923. A typo in zookeeperStarted document (Chengwei Yang via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1593428 13f79535-47bb-0310-9956-ffa450edef68 commit be77e4c030f6571f8dbf23df42af09a78b880396 Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-05-09T21:37:39Z ZOOKEEPER-1926. Unit tests should only use build/test/data for data (Enis Soztutar via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1593624 13f79535-47bb-0310-9956-ffa450edef68 commit 4a698763e3f8108d99b45be02340e9caa03e8909 Author: Rakesh Radhakrishnan <rake...@apache.org> Date: 2014-05-10T10:42:44Z ZOOKEEPER-1891. StaticHostProviderTest.testUpdateLoadBalancing times out (Michi Mutsuzaki via rakeshr) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1593682 13f79535-47bb-0310-9956-ffa450edef68 commit c761aef7e7d4829481c95ee35e243d7548a24131 Author: Rakesh Radhakrishnan <rake...@apache.org> Date: 2014-05-15T01:35:33Z ZOOKEEPER-657. Cut down the running time of ZKDatabase corruption (Michi Mutsuzaki via rakeshr) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1594755 13f79535-47bb-0310-9956-ffa450edef68 commit fc57a5a5b250dc77438ac5d47ced7fff6fc8612b Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-05-15T20:39:36Z ZOOKEEPER-1836. addrvec_next() fails to set next parameter if addrvec_hasnext() returns false (Dutch T. Meyer via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1595038 13f79535-47bb-0310-9956-ffa450edef68 commit 9a5e52e3e1dafc492b1c6417482850ac3a832f90 Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-05-16T17:56:10Z ZOOKEEPER-1895. update all notice files, copyright, etc... with the new year - 2014 git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1595273 13f79535-47bb-0310-9956-ffa450edef68 commit 1a7cea1aa2fb4dfac592768b9bcd457f759b173f Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-05-16T22:31:11Z ZOOKEEPER-1062. Net-ZooKeeper: Net::ZooKeeper consumes 100% cpu on wait (Botond Hejj via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1595374 13f79535-47bb-0310-9956-ffa450edef68 commit d7dfa3ed5e11795dab48649969f127f28bf76a5f Author: Rakesh Radhakrishnan <rake...@apache.org> Date: 2014-05-17T11:23:25Z ZOOKEEPER-1864. quorumVerifier is null when creating a QuorumPeerConfig from parsing a Properties object (Michi Mutsuzaki via rakeshr) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1595443 13f79535-47bb-0310-9956-ffa450edef68 commit 26bf47e5e095eaef1f1c6bde9a98895e7ab289eb Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-05-18T01:01:55Z ZOOKEEPER-1797. PurgeTxnLog may delete data logs during roll (Rakesh R via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1595552 13f79535-47bb-0310-9956-ffa450edef68 commit 22f45dc91715774f87599d0af50912542448b78c Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-05-18T02:42:14Z ZOOKEEPER-1791. ZooKeeper package includes unnecessary jars that are part of the package. (mahadev via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1595559 13f79535-47bb-0310-9956-ffa450edef68 commit 8a4db2facb096177b876a514e9eb4fddef9377f4 Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-05-18T03:49:06Z ZOOKEEPER-1214. QuorumPeer should unregister only its previsously registered MBeans instead of use MBeanRegistry.unregisterAll() method. (César Ãlvarez Núñez via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1595561 13f79535-47bb-0310-9956-ffa450edef68 commit 4e25490a2a36a49ec39492db0f49c7881b7e575b Author: Rakesh Radhakrishnan <rake...@apache.org> Date: 2014-05-20T15:10:30Z ZOOKEEPER-716. dump server memory detail to the log during startup (Michi Mutsuzaki via rakeshr) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1596284 13f79535-47bb-0310-9956-ffa450edef68 commit 70fb28a69ca4446d6313a26bdef39c38dc6e10aa Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-05-20T21:42:51Z ZOOKEEPER-1699. Leader should timeout and give up leadership when losing quorum of last proposed configuration (Alexander Shraer via michim) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1596422 13f79535-47bb-0310-9956-ffa450edef68 commit 9fc379dc5f10d9abd5f9653e8996538492b6e18f Author: Michi Mutsuzaki <mic...@apache.org> Date: 2014-05-21T17:48:37Z ZOOKEEPER-1699. Forgot to add a new file. git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1596635 13f79535-47bb-0310-9956-ffa450edef68 commit 216b5b58295bc0e607e9598bd65e79abf0091193 Author: Flavio Paiva Junqueira <f...@apache.org> Date: 2014-05-21T21:03:47Z ZOOKEEPER-1914. TestWatchers.cc failure - workaround (michim via fpj) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1596684 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. ---