Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-883_1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a3eb572c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a3eb572c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a3eb572c Branch: refs/heads/ignite-389 Commit: a3eb572ceeeb09f293f613ec6a572f8bc2a77ca0 Parents: 4184f36 ae5189a Author: sboikov <sboi...@gridgain.com> Authored: Thu Jun 4 09:50:46 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jun 4 09:50:46 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheContext.java | 3 - .../dht/GridDhtPartitionTopologyImpl.java | 8 +- .../GridDhtPartitionsExchangeFuture.java | 10 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 3 + .../ignite/spi/discovery/tcp/ServerImpl.java | 31 ----- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 56 +++++++- .../tcp/ipfinder/TcpDiscoveryIpFinder.java | 10 +- .../TcpDiscoveryMulticastIpFinder.java | 47 +++++-- .../cache/IgniteDynamicCacheStartSelfTest.java | 62 +++++++++ .../tcp/TcpClientDiscoverySpiMulticastTest.java | 129 +++++++++++++++++++ .../IgniteSpiDiscoverySelfTestSuite.java | 1 + .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 43 ++++--- 12 files changed, 321 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3eb572c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3eb572c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ----------------------------------------------------------------------
