Merge branches 'ignite-983' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-983
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46b24472 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46b24472 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46b24472 Branch: refs/heads/ignite-389-ipc Commit: 46b244723a0c39c7bb5bb92157d71032d655923a Parents: 51d4737 922c1c4 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Jun 4 15:29:43 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Jun 4 15:29:43 2015 +0700 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 3 + .../processors/cache/GridCacheContext.java | 3 - .../dht/GridDhtPartitionTopologyImpl.java | 8 +- .../GridDhtPartitionsExchangeFuture.java | 10 +- .../internal/visor/query/VisorQueryJob.java | 2 +- .../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 ++++--- .../commands/cache/VisorCacheScanCommand.scala | 2 +- 15 files changed, 326 insertions(+), 84 deletions(-) ----------------------------------------------------------------------
