Merge remote-tracking branch 'remotes/origin/ignite-883' into ignite-sprint-7
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6e23608f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6e23608f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6e23608f Branch: refs/heads/ignite-gg-10298 Commit: 6e23608fd0845fb30c470fbb2f0143c7d5d67f82 Parents: 847ddf5 efa92c5 Author: sboikov <sboi...@gridgain.com> Authored: Fri Jun 26 16:21:22 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jun 26 16:21:22 2015 +0300 ---------------------------------------------------------------------- .../GridCachePartitionExchangeManager.java | 6 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 151 ++++++----- .../ignite/spi/discovery/tcp/ServerImpl.java | 103 +++++-- .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 265 ++++++++++++++++++- 5 files changed, 448 insertions(+), 80 deletions(-) ----------------------------------------------------------------------
