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/26d12c7c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/26d12c7c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/26d12c7c Branch: refs/heads/ignite-zk Commit: 26d12c7c5e34aeab227f342e09d71c1a36ad3d78 Parents: 50e9b60 2283df2 Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 21 15:15:22 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 21 15:15:22 2017 +0300 ---------------------------------------------------------------------- .../datastreamer/DataStreamerImpl.java | 31 +++++++++++++------- .../zk/internal/ZookeeperDiscoveryImpl.java | 17 ++++++++--- ...niteClientReconnectFailoverAbstractTest.java | 7 +++-- 3 files changed, 38 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
