Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2a8ff1cf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2a8ff1cf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2a8ff1cf Branch: refs/heads/ignite-1753-1282 Commit: 2a8ff1cf688b6efa9e2bdbfa2b6de9ab977160d7 Parents: 4791907 7adfd4a Author: Denis Magda <dma...@gridgain.com> Authored: Wed Nov 4 17:44:25 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed Nov 4 17:44:25 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 1 + .../affinity/GridAffinityAssignmentCache.java | 13 +++ .../cache/GridCacheAffinityManager.java | 10 ++ .../GridCachePartitionExchangeManager.java | 24 +++++ .../processors/cache/GridCachePreloader.java | 5 + .../cache/GridCachePreloaderAdapter.java | 5 + .../dht/preloader/GridDhtForceKeysFuture.java | 14 +++ .../dht/preloader/GridDhtPreloader.java | 17 ++++ .../processors/job/GridJobProcessor.java | 96 +++++++++----------- .../GridTaskFailoverAffinityRunTest.java | 3 + ...niteCacheClientNodeChangingTopologyTest.java | 4 +- 11 files changed, 138 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2a8ff1cf/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ----------------------------------------------------------------------
