GitHub user JiangJiafu opened a pull request:
https://github.com/apache/zookeeper/pull/269
Sugon
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/JiangJiafu/zookeeper sugon
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/zookeeper/pull/269.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 #269
----
commit 489cec9b78b21a2a241eeab18ddfb968758b2e67
Author: JiangJiafu <[email protected]>
Date: 2017-02-13T11:36:44Z
ZOOKEEPER-2691: recreateSocketAddresses may recreate the unreachable IP
address
commit 31700c45030cca2d702fe0279443cd3f3b46a2b0
Author: JiangJiafu <[email protected]>
Date: 2017-02-14T02:00:13Z
ZOOKEEPER-2691: recreateSocketAddresses may recreate the unreachable IP
address
commit 5c1bf6bd452e8237cb0bb9d871f3d0b3d08e0de2
Author: JiangJiafu <[email protected]>
Date: 2017-02-18T01:46:10Z
ZOOKEEPER-2691: recreateSocketAddresses may recreate the unreachable IP
address
commit f4999a6df12d6ff42ea92596facb58d11695ba25
Author: JiangJiafu <[email protected]>
Date: 2017-05-11T11:07:07Z
Merge branch 'branch-3.4' of https://github.com/apache/zookeeper into
ZOOKEEPER-2691
commit aa7b63d047450d6d1189860d08a3bc16d3ca4243
Author: Jiang Jiafu <[email protected]>
Date: 2017-05-12T03:22:17Z
ZOOKEEPER-2691
commit e2589df9630fd0310c5a39275a25632b27c50a1a
Author: Jiang Jiafu <[email protected]>
Date: 2017-05-12T03:35:03Z
ZOOKEEPER-2691
commit eeb07f9b385d5e0161919f874466f837aaed3f99
Author: Jiang Jiafu <[email protected]>
Date: 2017-05-12T06:02:51Z
ZOOKEEPER-2691
commit c366949d6325cdc61aed59be30e37fe743186575
Author: Jiang Jiafu <[email protected]>
Date: 2017-05-12T09:29:51Z
ZOOKEEPER-2691
commit 6139f533af4f3b513bd713746449f147503168e0
Author: Jiang Jiafu <[email protected]>
Date: 2017-05-12T09:47:31Z
ZOOKEEPER-2691
commit 3ac65ead39fad4f8d9f26365e1bc73f83889f11e
Author: Jiang Jiafu <[email protected]>
Date: 2017-05-13T03:41:52Z
ZOOKEEPER-2774
commit b67c3730936aab8c5de38f0d56dd344e1d5a2a6a
Author: JiangJiafu <[email protected]>
Date: 2017-05-13T07:56:01Z
Merge pull request #1 from apache/branch-3.4
Branch 3.4
commit fbb52bc7156520ea70f8274a3ac9d46ea84d48b2
Author: Jiang Jiafu <[email protected]>
Date: 2017-05-13T07:57:59Z
Merge remote-tracking branch 'remotes/origin/ZOOKEEPER-2774' into sugon
commit 92d134e84f501003fc01a2d0018c0dc8406444fd
Author: Jiang Jiafu <[email protected]>
Date: 2017-05-13T07:58:23Z
Merge remote-tracking branch 'remotes/origin/ZOOKEEPER-2691' into sugon
commit dc2924977fb2d5527810581012c3144b4dc11632
Author: JiangJiafu <[email protected]>
Date: 2017-05-16T01:14:11Z
Update ZKUtil.java
commit 172e35153e7fa226fdffa41bd0f353ee6377098d
Author: JiangJiafu <[email protected]>
Date: 2017-05-16T01:15:21Z
Update ZKUtil.java
commit 5afbd4eb6a0d97c20df89d3c307f5092d19db5e1
Author: JiangJiafu <[email protected]>
Date: 2017-05-16T01:16:34Z
Update ZKUtil.java
commit 6913c0175065a0d88384d38016b52fdbfe78bac2
Author: JiangJiafu <[email protected]>
Date: 2017-05-16T01:59:04Z
Merge pull request #3 from JiangJiafu/ZOOKEEPER-2774
Zookeeper 2774
commit 61b5644f680ebc8ddcc5af1c9aee932a038a390b
Author: Jiang Jiafu <[email protected]>
Date: 2017-05-17T07:51:18Z
ZOOKEEPER-2691
commit 61f5b20b5b86fd68901016b7c9715033fc88ef5c
Author: Jiang Jiafu <[email protected]>
Date: 2017-05-17T07:59:26Z
Remove unnecessary change.
commit 5afa15d3fd2f9e8eee5b57165b058c6fe015ead5
Author: Jiang Jiafu <[email protected]>
Date: 2017-05-19T01:14:31Z
Merge branch 'branch-3.4' of https://github.com/apache/zookeeper into HEAD
commit f9bfd1de0371adf5ea9a2e98c8df64ec9e161e51
Author: Jiang Jiafu <[email protected]>
Date: 2017-05-19T01:31:31Z
Merge remote-tracking branch 'origin/branch-3.4' into sugon
Conflicts:
src/java/main/org/apache/zookeeper/ZKUtil.java
src/java/test/org/apache/zookeeper/test/ReadOnlyModeTest.java
commit 712925098704c8a77a3ff504c08ca0e89f17ea9b
Author: Jiang Jiafu <[email protected]>
Date: 2017-05-19T01:32:58Z
Merge branch 'sugon' of https://github.com/JiangJiafu/zookeeper into sugon
commit 4b265f8a9952df555be53b4d3a4e0d5a6bae8eb9
Author: JiangJiafu <[email protected]>
Date: 2017-05-19T01:37:10Z
Merge pull request #4 from JiangJiafu/ZOOKEEPER-2691
Zookeeper 2691
----
---
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.
---
