Merging fixes to master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6844370d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6844370d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6844370d Branch: refs/heads/ignite-1272 Commit: 6844370dc16790423a59fb9e9f6ec39ca0699b9b Parents: 075e7d0 30b731b Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Mon Oct 12 20:14:14 2015 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Mon Oct 12 20:14:14 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(-) ----------------------------------------------------------------------
