GitHub user tywe opened a pull request:
https://github.com/apache/zookeeper/pull/596
update code
update zookeeper code
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/tywe/zookeeper trunk
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/zookeeper/pull/596.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 #596
----
commit 66fc7fe246b91570f49833109eb624ebe8df2033
Author: Patrick D. Hunt <phunt@...>
Date: 2013-02-20T00:47:18Z
ZOOKEEPER-1597. Windows build failing (michim via phunt) part 3
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1447982
13f79535-47bb-0310-9956-ffa450edef68
commit 46b565e6abd8423c43f1bb8da782d76bac7c392c
Author: Michi Mutsuzaki <michim@...>
Date: 2013-02-20T05:24:31Z
ZOOKEEPER-1643. Windows: fetch_and_add not 64bit-compatible, may not be
correct (Erik Anderson via michim)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1448007
13f79535-47bb-0310-9956-ffa450edef68
commit 675ef85ba5cd97d69b875d14854b638da6f4423c
Author: Benjamin Reed <breed@...>
Date: 2013-03-07T06:01:49Z
ZOOKEEPER-107. Allow dynamic changes to server cluster membership (Alex
Shraer via breed)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1453693
13f79535-47bb-0310-9956-ffa450edef68
commit 99af51962a24ef8ec2fe4f7cf850879d0f014ffd
Author: Camille Fournier <camille@...>
Date: 2013-03-12T01:48:52Z
ZOOKEEPER-107. Allow dynamic changes to server cluster membership, small
bugfix (michi via camille)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1455387
13f79535-47bb-0310-9956-ffa450edef68
commit 01e08b661d33c0e4c3e3daf45f74ca35d9c2decc
Author: Camille Fournier <camille@...>
Date: 2013-03-19T15:53:06Z
ZOOKEEPER-107. Allow dynamic changes to server cluster membership. Small
C++ build file fixes (michim via camille)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1458356
13f79535-47bb-0310-9956-ffa450edef68
commit a25fa99aff904678cf0cc0b76467ab5dcf80ca8f
Author: Patrick D. Hunt <phunt@...>
Date: 2013-03-20T06:17:41Z
ZOOKEEPER-1672. zookeeper client does not accept "-members" option in
reconfig command (Xiaoshuang Wang via phunt)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1458648
13f79535-47bb-0310-9956-ffa450edef68
commit f1a84864257fecc8a7dcd6ed130a4570bc865cf4
Author: Camille Fournier <camille@...>
Date: 2013-03-28T15:07:41Z
ZOOKEEPER-107. Allow dynamic changes to server cluster membership. C++ test
fixes (michim via camille)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1462141
13f79535-47bb-0310-9956-ffa450edef68
commit 047b07a298d84e9755c6e06c035787ce397f4958
Author: Michi Mutsuzaki <michim@...>
Date: 2013-04-01T23:01:06Z
ZOOKEEPER-1411. Consolidate membership management, distinguish between
static and dynamic configuration parameters. A small bug fix.
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1463329
13f79535-47bb-0310-9956-ffa450edef68
commit 7bbf49b9dc10c533d4af881da790bbbd6a7cae34
Author: Flavio Paiva Junqueira <fpj@...>
Date: 2013-05-11T12:51:25Z
ZOOKEEPER-1700. FLETest consistently failing - setLastSeenQuorumVerifier
seems to be hanging (phunt via fpj)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1481317
13f79535-47bb-0310-9956-ffa450edef68
commit 0501da38132e573699fa363959485476f56fd08e
Author: Flavio Paiva Junqueira <fpj@...>
Date: 2013-05-11T13:35:13Z
ZOOKEEPER-1697. large snapshots can cause continuous quorum failure
(phunt via fpj)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1481325
13f79535-47bb-0310-9956-ffa450edef68
commit 2de54429fdf54b562fdfd0e2611ada93e42bede8
Author: Flavio Paiva Junqueira <fpj@...>
Date: 2013-05-13T07:32:47Z
ZOOKEEPER-1706. Typo in Double Barriers example (Jingguo Yao via fpj)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1481718
13f79535-47bb-0310-9956-ffa450edef68
commit 17895342a059b348908a8e9f0604889aa96871f1
Author: Flavio Paiva Junqueira <fpj@...>
Date: 2013-05-14T12:27:11Z
ZOOKEEPER-1324. Remove Duplicate NEWLEADER packets
from the Leader to the Follower. (Thawan, fpj via fpj)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1482318
13f79535-47bb-0310-9956-ffa450edef68
commit 6808bc95ff3b00784a63e1a430f4113539812833
Author: Camille Fournier <camille@...>
Date: 2013-05-16T16:49:11Z
ZOOKEEPER-1642. Leader loading database twice (fpj via camille)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1483440
13f79535-47bb-0310-9956-ffa450edef68
commit adef15ab35d494ed67773602ddf613ea4d116cde
Author: Camille Fournier <camille@...>
Date: 2013-05-19T21:58:21Z
ZOOKEEPER-1663. scripts don't work when path contains spaces (Amichai
Rothman via camille)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1484355
13f79535-47bb-0310-9956-ffa450edef68
commit 77d22570fab4579126433455d225fe76a0fbf707
Author: Michi Mutsuzaki <michim@...>
Date: 2013-05-19T22:08:08Z
ZOOKEEPER-1400. Allow logging via callback instead of raw FILE pointer
(Marshall McMullen via michim)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1484357
13f79535-47bb-0310-9956-ffa450edef68
commit aa52bfb3afe0eb50de37be1dbc4ea565c0e62adc
Author: Camille Fournier <camille@...>
Date: 2013-05-20T17:08:25Z
ZOOKEEPER-1663. scripts don't work when path contains spaces (Amichai
Rothman via camille)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1484527
13f79535-47bb-0310-9956-ffa450edef68
commit db7ce3c10c37de703dd907d4e2065d1e5766c0f9
Author: Camille Fournier <camille@...>
Date: 2013-06-06T16:53:06Z
ZOOKEEPER-1417. investigate differences in client last zxid handling btw c
and java clients (thawan via camille)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1490358
13f79535-47bb-0310-9956-ffa450edef68
commit e37c65a9b05b1e4d1e56a936ec47d013ab955a5c
Author: Camille Fournier <camille@...>
Date: 2013-06-21T17:56:06Z
ZOOKEEPER-1714 perl client segfaults if ZOO_READ_ACL_UNSAFE constant is used
(Botond Hejj via camille)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1495522
13f79535-47bb-0310-9956-ffa450edef68
commit ad8f9a4431530d492b0d7f435994110359d83697
Author: Camille Fournier <camille@...>
Date: 2013-06-28T16:26:09Z
ZOOKEEPER-1719. zkCli.sh, zkServer.sh and zkEnv.sh regression caused by
ZOOKEEPER-1663
(Marshall McMullen via camille)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1497830
13f79535-47bb-0310-9956-ffa450edef68
commit 885c895e5aa7e9143ec5bf3dbff9aebec546ac5b
Author: Thawan Kooburat <thawan@...>
Date: 2013-06-28T21:22:35Z
ZOOKEEPER-1413. Use on-disk transaction log for learner sync up (thawan)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1497929
13f79535-47bb-0310-9956-ffa450edef68
commit bfa37c5d54186da76c976e323af81c562fb5e262
Author: Patrick D. Hunt <phunt@...>
Date: 2013-07-01T22:54:25Z
ZOOKEEPER-1702. ZooKeeper client may write operation packets before
receiving successful response to connection request, can cause TCP RST (Chris
Nauroth via phunt)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1498732
13f79535-47bb-0310-9956-ffa450edef68
commit 281024b69341a2d6ec6a3a1f8db4e63f691eb21d
Author: Camille Fournier <camille@...>
Date: 2013-07-14T20:09:45Z
ZOOKEEPER-1629. testTransactionLogCorruption occasionally fails. (shralex
via camille)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1503045
13f79535-47bb-0310-9956-ffa450edef68
commit 254d1445a17d14605ee7232882b16ef786c83041
Author: Camille Fournier <camille@...>
Date: 2013-07-15T01:28:42Z
ZOOKEEPER-1629. testTransactionLogCorruption occasionally fails. (shralex
via camille)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1503101
13f79535-47bb-0310-9956-ffa450edef68
commit a8e1f098e764d14bde73d27a489d2038273ed07b
Author: Flavio Paiva Junqueira <fpj@...>
Date: 2013-08-21T09:40:42Z
ZOOKEEPER-1400. Allow logging via callback instead of raw FILE pointer
(michi via fpj)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1516123
13f79535-47bb-0310-9956-ffa450edef68
commit 186e31de6a03aed50b2b45e79d9559600e1885bd
Author: Flavio Paiva Junqueira <fpj@...>
Date: 2013-08-21T09:53:37Z
ZOOKEEPER-1679. c client: use -Wdeclaration-after-statement (michi via fpj)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1516126
13f79535-47bb-0310-9956-ffa450edef68
commit b7b3649f82c8b2f9479b3aaf5127153d313600ec
Author: Flavio Paiva Junqueira <fpj@...>
Date: 2013-09-02T20:22:45Z
ZOOKEEPER-1713. wrong time calculation in zkfuse.cc (german via fpj)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1519511
13f79535-47bb-0310-9956-ffa450edef68
commit e40fa36a8b826deaee402d7f10c91b99764c1dcd
Author: Flavio Paiva Junqueira <fpj@...>
Date: 2013-09-02T21:04:12Z
ZOOKEEPER-1379. 'printwatches, redo, history and connect '. client commands
always print usage. This is not necessary (edward via fpj)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1519515
13f79535-47bb-0310-9956-ffa450edef68
commit b5abb53634484e2bac075691f7ec69681a310431
Author: Flavio Paiva Junqueira <fpj@...>
Date: 2013-09-03T11:40:38Z
ZOOKEEPER-1670. zookeeper should set a default value for SERVER_JVMFLAGS
and CLIENT_JVMFLAGS so that memory usage is controlled (Arpit Gupta via fpj)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1519655
13f79535-47bb-0310-9956-ffa450edef68
commit 29ccb1c224b92da261f0c22e41103c6b4beceede
Author: Flavio Paiva Junqueira <fpj@...>
Date: 2013-09-05T21:50:08Z
ZOOKEEPER-1448. Node+Quota creation in transaction log can crash leader
startup (Botond Hejj via fpj)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1520436
13f79535-47bb-0310-9956-ffa450edef68
commit 9daca95cd22a1ae8efdf1db95ca23d538f7e252d
Author: Michi Mutsuzaki <michim@...>
Date: 2013-09-09T22:37:13Z
ZOOKEEPER-1750 Race condition producing NPE in NIOServerCnxn.toString
(Rakesh R via michim)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1521308
13f79535-47bb-0310-9956-ffa450edef68
----
---
