Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6A5F018BE3 for ; Tue, 10 Nov 2015 08:40:54 +0000 (UTC) Received: (qmail 39519 invoked by uid 500); 10 Nov 2015 08:40:54 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 39341 invoked by uid 500); 10 Nov 2015 08:40:54 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 39205 invoked by uid 99); 10 Nov 2015 08:40:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Nov 2015 08:40:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DC991E0B11; Tue, 10 Nov 2015 08:40:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Tue, 10 Nov 2015 08:41:07 -0000 Message-Id: <8914d9275fb3442582d6bbc745741610@git.apache.org> In-Reply-To: <0c0d33913abd4aad915924b339f73de7@git.apache.org> References: <0c0d33913abd4aad915924b339f73de7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/37] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5 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-1843 Commit: 2a8ff1cf688b6efa9e2bdbfa2b6de9ab977160d7 Parents: 4791907 7adfd4a Author: Denis Magda Authored: Wed Nov 4 17:44:25 2015 +0300 Committer: Denis Magda 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 ----------------------------------------------------------------------