Merge remote-tracking branch 'remotes/origin/master' into ignite-1607
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/775dba2f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/775dba2f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/775dba2f Branch: refs/heads/ignite-1607 Commit: 775dba2f9425fd2f510e0b67e6b2a764844edd5d Parents: 236344c 6844370 Author: sboikov <[email protected]> Authored: Tue Oct 13 09:58:48 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Oct 13 09:58:48 2015 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 479 +------------------ .../processors/cache/GridCacheIoManager.java | 29 +- .../processors/cache/GridCacheProcessor.java | 63 +-- .../dht/GridClientPartitionTopology.java | 13 +- .../distributed/dht/GridDhtLocalPartition.java | 3 +- .../dht/GridDhtPartitionTopologyImpl.java | 12 +- .../GridDhtPartitionDemandMessage.java | 4 +- .../GridDhtPartitionSupplyMessage.java | 3 +- .../GridDhtPartitionsExchangeFuture.java | 12 +- .../preloader/GridDhtPartitionsFullMessage.java | 12 +- .../GridDhtPartitionsSingleMessage.java | 11 +- .../dht/preloader/GridDhtPreloader.java | 18 +- .../cache/query/GridCacheQueryManager.java | 41 -- .../processors/rest/GridRestProcessor.java | 47 -- .../top/GridTopologyCommandHandler.java | 129 ----- .../communication/tcp/TcpCommunicationSpi.java | 22 +- .../IgniteCacheConfigurationTemplateTest.java | 31 ++ .../dht/GridCacheDhtPreloadPerformanceTest.java | 133 +++++ .../near/GridCacheNearTxForceKeyTest.java | 2 +- 19 files changed, 270 insertions(+), 794 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/775dba2f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ----------------------------------------------------------------------
