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/88570338
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/88570338
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/88570338

Branch: refs/heads/ignite-zk
Commit: 88570338605f28cb7b66e73f985da5b8cf7274cd
Parents: da3e7c8 8544122
Author: sboikov <[email protected]>
Authored: Thu Dec 21 16:49:55 2017 +0300
Committer: sboikov <[email protected]>
Committed: Thu Dec 21 16:49:55 2017 +0300

----------------------------------------------------------------------
 .../IgniteDiscoverySpiInternalListener.java     |   4 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   2 +-
 .../spi/discovery/zk/ZookeeperDiscoverySpi.java |  11 +-
 .../zk/internal/ZookeeperDiscoveryImpl.java     |  25 +-
 .../internal/DiscoverySpiTestListener.java      |   3 +-
 .../discovery/AuthenticationRestartTest.java    |  20 +-
 .../ZookeeperDiscoverySpiBasicTest.java         | 265 ++++++++++++++++++-
 .../IgniteClientReconnectTestSuite.java         |  13 +
 8 files changed, 319 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


Reply via email to