Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/42f65d98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/42f65d98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/42f65d98 Branch: refs/heads/ignite-218 Commit: 42f65d982ef4e31658d1893c6ebe184249190702 Parents: 5cbb7dd bf3203a Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Thu Jun 4 13:42:26 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Thu Jun 4 13:42:26 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 13 +- .../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 ++++--- ...acheConfigurationPrimitiveTypesSelfTest.java | 104 +++++++++++++++ .../IgniteCacheWithIndexingTestSuite.java | 2 + .../commands/cache/VisorCacheScanCommand.scala | 2 +- 18 files changed, 444 insertions(+), 85 deletions(-) ----------------------------------------------------------------------
