Skip to content

Branch 3.5#35

Closed
leoricxu wants to merge 93 commits intoapache:trunkfrom
leoricxu:branch-3.5
Closed

Branch 3.5#35
leoricxu wants to merge 93 commits intoapache:trunkfrom
leoricxu:branch-3.5

Conversation

@leoricxu
Copy link

@leoricxu leoricxu commented Jun 13, 2015

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1684112 13f79535-47bb-0310-9956-ffa450edef68

phunt and others added 30 commits August 1, 2014 21:42
@phunt
Branching for 3.5 releases
47d8b90 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1615238 13f79535-47bb-0310-9956-ffa450edef68
@phunt
Preparing for release 3.5.0
ecd7b9f 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1615247 13f79535-47bb-0310-9956-ffa450edef68
@phunt
Preparing for release 3.5.0
ee81cff 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1615252 13f79535-47bb-0310-9956-ffa450edef68
@phunt
Setup for 3.5.1 development activities
a7c2baa 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1616091 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1994. Auto-backup configuration files; config version becom…
efe0703 
…es part of filename (Hongchao Deng via shralex)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1617887 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2008. Missing leader election port in system test. (Kfir Le…
1775bbc 
…v-Ari via Alex Shraer).

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1617893 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2008-Fix. Correcting small issue in committed 2008 patch.
8ad913d 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1617922 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2006. Standalone mode won't take client port from dynamic c…
67967b2 
…onfig. (Hongchao Deng via Alex Shraer)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1618978 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2013. Typos in programmer guide. (Tim Chambers via Alex Shr…
6277c4b 
…aer)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1619167 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2000. Fix ReconfigTest.testPortChange (Alexander Shraer via…
ca42b06 
… michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1619278 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2017 New tests for reconfig failure cases (Alexander Shraer…
19d0c87 
… and Hongchao Deng via michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1620112 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wander…
1b56170 
…man-Milne via shralex)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1621314 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2032. Cleaning up resources in ReconfigBackupTest (Hongchao…
3a06766 
… Deng via shralex)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1623918 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2030 dynamicConfigFile should have an absolute path, not a …
5aac8ac 
…relative

path, to the dynamic configuration file (Alexander Shraer via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1625463 13f79535-47bb-0310-9956-ffa450edef68
@rakeshadr
ZOOKEEPER-2047 testTruncationNullLog fails on windows (flavio via rak…
88c974b 
…eshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1627925 13f79535-47bb-0310-9956-ffa450edef68
@fpj
ZOOKEEPER-2039. Jute compareBytes incorrect comparison index (Ian Dim…
266d5ee 
…ayuga via fpj)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1628059 13f79535-47bb-0310-9956-ffa450edef68
@rakeshadr
ZOOKEEPER-2026 Startup order in ServerCnxnFactory-ies is wrong (Stevo…
c3e94d0 
… Slavic via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1628088 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1917 Apache Zookeeper logs cleartext admin passwords (fpj v…
d5cc02a 
…ia michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1628125 13f79535-47bb-0310-9956-ffa450edef68
@rakeshadr
ZOOKEEPER-1948 Enable JMX remote monitoring (Biju Nair via rakeshr)
6aa4741 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1628226 13f79535-47bb-0310-9956-ffa450edef68
@rakeshadr
ZOOKEEPER-1917 Apache Zookeeper logs cleartext admin passwords (michi…
c669847 
…m via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1631278 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2049 Yosemite build failure: htonll conflict (Till Toenshof…
ced70e1 
…f via michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1632211 13f79535-47bb-0310-9956-ffa450edef68
@rakeshadr
ZOOKEEPER-2052 Unable to delete a node when the node has no children …
8b9168a 
…(Hongchao Deng and Yip Ng via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1634778 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2079 Stop daemon with "kill" rather than "kill -9" (Guillau…
bea7fea 
…me ALAUX via michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1640070 13f79535-47bb-0310-9956-ffa450edef68
@fpj
ZOOKEEPER-2060 Trace bug in NettyServerCnxnFactory (Ian via fpj)
5fea943 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1640636 13f79535-47bb-0310-9956-ffa450edef68
@fpj
ZOOKEEPER-2064 Prevent resource leak in various classes (Ted Yu via fpj)
44dbb64 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1642440 13f79535-47bb-0310-9956-ffa450edef68
@fpj
ZOOKEEPER-1963 Make JDK 7 the minimum requirement for Zookeeper
d516b92 
(Hongchao via fpj)



git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1646346 13f79535-47bb-0310-9956-ffa450edef68
@fpj
ZOOKEEPER-2069 Netty Support for ClientCnxnSocket (Hongchao via fpj)
c4fae26 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1646990 13f79535-47bb-0310-9956-ffa450edef68
@rakeshadr
ZOOKEEPER-2110 Typo fixes in the ZK documentation. (Jeffrey Schroeder…
3dcfaf6 
… via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1655085 13f79535-47bb-0310-9956-ffa450edef68
@rakeshadr
ZOOKEEPER-2072 Netty Server Should Configure Child Channel Pipeline B…
bf9d4be 
…y Specifying ChannelPipelineFactory(Hongchao via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1655911 13f79535-47bb-0310-9956-ffa450edef68
@rakeshadr
ZOOKEEPER-2111 Not isAlive states should be synchronized in ClientCnx…
d68a826 
…n (Hongchao via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1656168 13f79535-47bb-0310-9956-ffa450edef68
Michi Mutsuzaki and others added 27 commits May 14, 2015 05:11
ZOOKEEPER-2186 QuorumCnxManager#receiveConnection may crash with rand…
694fe8c 
…om input (rgs via michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1679314 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2183 Concurrent Testing Processes and Port Assignments (Chr…
6383df8 
…is Nauroth via hdeng)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1679401 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2183 Concurrent Testing Processes and Port Assignments (Chr…
419756a 
…is Nauroth via hdeng)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1679402 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2183 Concurrent Testing Processes and Port Assignments (Chr…
611c17a 
…is Nauroth via hdeng)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1679403 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2190 fix StandaloneDisabledTest#testReconfig
21865b6 
In StandaloneDisabledTest, testReconfig() shouldn't take leaving servers
as joining servers (Hongchao Deng via rgs).

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1679446 13f79535-47bb-0310-9956-ffa450edef68
@rakeshadr
ZOOKEEPER-2126 Improve exit log messsage of EventThread and SendThrea…
e45d955 
…d by adding SessionId (surendra singh lilhore via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1679490 13f79535-47bb-0310-9956-ffa450edef68
Preparing for release 3.5.1-alpha
f1693c7 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1679683 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-1077: C client lib doesn't build on Solaris (Chris Nauroth …
45e523f 
…via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1679952 13f79535-47bb-0310-9956-ffa450edef68
@rakeshadr
ZOOKEEPER-2156: If JAVA_HOME is not set zk startup and fetching statu…
3c02868 
…s command execution result misleads user (J.Andreina via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1680473 13f79535-47bb-0310-9956-ffa450edef68
@rakeshadr
ZOOKEEPER-2191: Continue supporting prior Ant versions that don't imp…
3580ea0 
…lement the threads attribute for the JUnit task (Chris Nauroth via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1680995 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2187: remove duplicated code between CreateRequest{,2}
a9556fa 
(Raul Gutierrez Segales via hdeng)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1682522 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2179: Typo in Watcher.java (Archana T via rgs)
45e680f 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1682540 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2189: QuorumCnxManager: use BufferedOutputStream for initia…
f1f7b37 
…l msg

(Raul Gutierrez Segales via hdeng)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1682556 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2098: QuorumCnxManager: use BufferedOutputStream for initia…
76bb674 
…l msg

(Raul Gutierrez Segales via hdeng)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1682625 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2198 Set default test.junit.threads to 1 (Chris Nauroth via…
947b75d 
… michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1682702 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2178 Native client fails compilation on Windows. (Chris Nau…
a3dfdab 
…roth via michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1682825 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2197 non-ascii character in FinalRequestProcessor.java
d9fcded 
To be able to use utf-8 in .java source files we now use utf-8
encoding to build them (Michi Mutsuzaki via rgs).

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1683043 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2096: C client builds with incorrect error codes in VisualS…
87c7a0c 
…tudio 2010+

(Vitaly Stakhovsky via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1683164 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2194: Let DataNode.getChildren() return an unmodifiable vie…
9068a31 
…w of its

children set (Hitoshi Mitake via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1683588 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2204: LearnerSnapshotThrottlerTest.testHighContentionWithTi…
ec67247 
…meout

fails occasionally (Donny Nadolny via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1683603 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2205: Log type of unexpected quorum packet in learner handl…
d68d801 
…er loop

(Hitoshi Mitake via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1683834 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2206: Add missing packet types to LearnerHandler.packetToSt…
1899466 
…ring()

(Hitoshi Mitake via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1683843 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2207: Enhance error logs with LearnerHandler.packetToString()
15a975e 
(Hitoshi Mitake via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1683849 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2208: Log type of unexpected quorum packet in observer loop
51cde20 
(Akihiro Suda via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1683852 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2201: Network issues can cause cluster to hang due to near-…
c1b1636 
…deadlock

(Donny Nadolny via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1683930 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2163: Introduce new ZNode type: container
cde0cf3 
(Jordan Zimmerman via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1683960 13f79535-47bb-0310-9956-ffa450edef68
Preparing for release 3.5.1-alpha
91ecdac 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.5@1684112 13f79535-47bb-0310-9956-ffa450edef68
@Humbedooh Humbedooh closed this Mar 17, 2017
@leoricxu leoricxu deleted the branch-3.5 branch April 5, 2017 14:54
ztzg pushed a commit to ztzg/zookeeper that referenced this pull request Nov 20, 2019
@ewhauser
Merge pull request apache#35 from XiaoFan1519/trunk
9567617 
NullReferenceException
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@leoricxu @Humbedooh @phunt @rakeshadr @fpj @skamille @rgs1