Skip to content

merge Request#226

Closed
tianrobin wants to merge 1394 commits intoapache:masterfrom
tianrobin:trunk
Closed

merge Request#226
tianrobin wants to merge 1394 commits intoapache:masterfrom
tianrobin:trunk

Conversation

@tianrobin
Copy link
Copy Markdown

@tianrobin tianrobin commented Apr 12, 2017

merge from

Michi Mutsuzaki and others added 30 commits March 5, 2014 21:53
ZOOKEEPER-1779. ReconfigTest littering the source root with test file…
e67eea5 
…s (Abhiraj Butala via michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1574686 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1888. ZkCli.cmd commands fail with "'java' is not recognize…
af97461 
…d 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
ZOOKEEPER-1662. Fix to two small bugs in ReconfigTest.testPortChange(…
8b58987 
…) (Alexander Shraer via michim)

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

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

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

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

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

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

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

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

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

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

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

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

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1582055 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1878. Reset zookeeper.datadir.autocreate (Rakesh R via michim)
1cf687e 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1582067 13f79535-47bb-0310-9956-ffa450edef68
@skamille
ZOOKEEPER-1894. ObserverTest.testObserver fails consistently. (michim…
4cf3f89 
… via camille)

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

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1582941 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1408. CLI: sort output of ls command (Hartmut Lang via michim)
4474276 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1582943 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1219. LeaderElectionSupport recipe is unnecessarily dispatc…
b5c25d7 
…hing 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
ZOOKEEPER-1728. Better error message when reconfig invoked in standal…
fa6d21f 
…one mode (Alexander Shraer via michim)

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

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1583495 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1701. When new and old config have the same version, no nee…
dd41748 
…d 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
ZOOKEEPER-1730. Make ZooKeeper easier to test - support simulating a …
c40e883 
…session expiration (Jordan Zimmerman via michim)

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

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1583783 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1897. ZK Shell/Cli not processing commands (stack via michim)
12cbad0 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584438 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1830. Support command line shell for removing watches (Rake…
d293c90 
…sh R via michim)

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

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584459 13f79535-47bb-0310-9956-ffa450edef68
Set svn:eol-style property to native.
c8297c9 
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1584497 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatch…
5d1ed66 
…es 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
cnauroth and others added 29 commits October 3, 2015 21:07
@cnauroth
ZOOKEEPER-2281: ZK Server startup fails if there are spaces in the JA…
9638c4d 
…VA_HOME path (Neha Bathra via cnauroth)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1706631 13f79535-47bb-0310-9956-ffa450edef68
@cnauroth
ZOOKEEPER-1460: IPv6 literal address not supported for quorum members…
33de664 
… (Joseph Walton via cnauroth)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1709293 13f79535-47bb-0310-9956-ffa450edef68
@fpj
ZOOKEEPER-2302: Some test cases are not running because wrongly named…
d2573c0 
… (Arshad Mohammad via fpj)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1711151 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-2142: JMX ObjectName is incorrect for observers (Edward Rib…
e91cfda 
…eiro via michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1711694 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-1872: QuorumPeer is not shutdown in few cases
696f031 
(Rakesh R. via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1712218 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2211: PurgeTxnLog does not correctly purge when snapshots and
f16133d 
logs are at different locations (Arshad Mohammad via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1713296 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2227: stmk four-letter word fails execution at server while
8f836e1 
reading trace mask argument (Chris Nauroth via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1713300 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-1853: zkCli.sh can't issue a CREATE command containing
808d744 
spaces in the data (Ryan Lamore via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1713303 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2315: Change client connect zk service timeout log level fr…
1a37521 
…om Info

to Warn level (Lin Yiqun via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1713312 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2240: Make the three-node minimum more explicit in document…
859e9d8 
…ation

and on website (Shawn Heisey via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1713320 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2229: Several four-letter words are undocumented
fda27b9 
(Chris Nauroth via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1713774 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-1929: std::length_error on update children
42c079b 
(Charles Strahan via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1715557 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-1371: Remove dependency on log4j in the source code
4be4adf 
(Arshad Mohammad via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1715577 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2329: Clear javac and javadoc warning from zookeeper
e78a703 
(Arshad Mohammad via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1715590 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2330: ZooKeeper close API does not close Login thread
02c24d2 
(Arshad Mohammad via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1718121 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2326: Include connected server address:port in log
11874f2 
(Arshad Mohammad via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1718123 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2335: Java Compilation Error in ClientCnxn.java
96f6bde 
(Arshad Mohammad via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1718205 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2311: assert in setup_random
b4da11f 
(Marshall McMullen via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1718207 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2306: Remove file delete duplicate code from test code
082acc7 
(Arshad Mohammad via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1718212 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2304: JMX ClientPort from ZooKeeperServerBean incorrect
42a4872 
(Arshad Mohammad via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1718214 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2301: QuorumPeer does not listen on passed client IP in the…
84be062 
… constructor

(Arshad Mohammad via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1718251 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2299: NullPointerException in LocalPeerBean for ClientAddress
8df65c7 
(Arshad Mohammad via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1718253 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2300: Expose SecureClientPort and SecureClientAddress JMX p…
0b017a4 
…roperties

(Arshad Mohammad via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1718255 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2336: Jenkins not working due to old SVN
dcfc623 
(Akihiro Suda via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1718511 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2295: TGT refresh time logic is wrong
9d48f70 
(Arshad Mohammad via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1718758 13f79535-47bb-0310-9956-ffa450edef68
@rgs1
ZOOKEEPER-2340: JMX is disabled even if JMXDISABLE is false
c6f03ca 
(Arshad Mohammad via rgs)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1719011 13f79535-47bb-0310-9956-ffa450edef68
@cnauroth
ZOOKEEPER-2252: Random test case failure in org.apache.zookeeper.test…
fa1d5f8 
….StaticHostProviderTest (Timothy Ward via cnauroth)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1719204 13f79535-47bb-0310-9956-ffa450edef68
@cnauroth
ZOOKEEPER-1029: C client bug in zookeeper_init (if bad hostname is gi…
735ea78 
…ven) (fpj via cnauroth)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1719528 13f79535-47bb-0310-9956-ffa450edef68
@cnauroth
ZOOKEEPER-412: checkstyle target fails trunk build (Akihiro Suda via …
92707a6 
…cnauroth)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1720227 13f79535-47bb-0310-9956-ffa450edef68
@tianrobin tianrobin closed this Apr 12, 2017
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

@tianrobin @rgs1 @skamille @rakeshadr @fpj @phunt @cnauroth