Merge remote-tracking branch 'origin/ignite-zk' into ignite-zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ac07cbee Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ac07cbee Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ac07cbee Branch: refs/heads/ignite-zk Commit: ac07cbee75f3f230a12075ac91e4dad0f1a89b0b Parents: 775a60f 1ee551c Author: sboikov <[email protected]> Authored: Wed Nov 15 10:10:24 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Nov 15 10:10:24 2017 +0300 ---------------------------------------------------------------------- .../spi/discovery/zk/ZookeeperDiscoverySpi.java | 135 ++++++++++++------- .../zk/ZookeeperDiscoverySpiBasicTest.java | 17 ++- 2 files changed, 102 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ac07cbee/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java ----------------------------------------------------------------------
