Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c173973e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c173973e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c173973e Branch: refs/heads/ignite-2004 Commit: c173973ed2e8c5d99b01dc6c9f5a9969693f4616 Parents: 4d43553 5e26615 Author: sboikov <[email protected]> Authored: Thu Apr 7 10:03:36 2016 +0300 Committer: sboikov <[email protected]> Committed: Thu Apr 7 10:03:36 2016 +0300 ---------------------------------------------------------------------- .../GridDhtPartitionsExchangeFuture.java | 2 +- .../continuous/GridContinuousProcessor.java | 13 +++++- .../ignite/spi/discovery/tcp/ClientImpl.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 44 +++++++++----------- .../spi/discovery/tcp/TcpDiscoverySpi.java | 23 ++++------ .../IgniteClientReconnectAbstractTest.java | 7 ++-- .../tcp/TcpClientDiscoverySpiSelfTest.java | 8 ++-- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 39 +++++++++-------- .../TcpDiscoverySpiFailureTimeoutSelfTest.java | 23 ++++------ .../spi/discovery/tcp/TestTcpDiscoverySpi.java | 5 ++- 10 files changed, 80 insertions(+), 86 deletions(-) ----------------------------------------------------------------------
