Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-gg-10453
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d86882c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d86882c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d86882c3 Branch: refs/heads/ignite-973-2 Commit: d86882c3597080c62877ba36b916dda29089b900 Parents: 3231f93 6e23608 Author: sboikov <sboi...@gridgain.com> Authored: Fri Jun 26 16:55:32 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jun 26 16:55:32 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 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 265 ++++++++++++++++++- 6 files changed, 451 insertions(+), 81 deletions(-) ----------------------------------------------------------------------
