Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-836_2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0bfd42b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0bfd42b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0bfd42b4 Branch: refs/heads/ignite-836_2 Commit: 0bfd42b445525a2e3adc88f3d9b2d96faae14202 Parents: cff3c66 bf80c27 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Wed May 6 16:23:14 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Wed May 6 16:23:14 2015 +0300 ---------------------------------------------------------------------- .../spi/discovery/tcp/TcpDiscoverySpi.java | 22 +- ...ientModesTcpClientDiscoveryAbstractTest.java | 10 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 65 ++-- .../ignite/testsuites/IgniteCacheTestSuite.java | 299 ------------------- .../testsuites/IgniteCacheTestSuite2.java | 141 +++++++++ .../testsuites/IgniteCacheTestSuite3.java | 143 +++++++++ .../testsuites/IgniteCacheTestSuite4.java | 131 ++++++++ 7 files changed, 458 insertions(+), 353 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0bfd42b4/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ----------------------------------------------------------------------
