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 BC1CC18CFF for ; Tue, 9 Jun 2015 07:14:53 +0000 (UTC) Received: (qmail 91233 invoked by uid 500); 9 Jun 2015 07:14:53 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 91201 invoked by uid 500); 9 Jun 2015 07:14:53 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 91192 invoked by uid 99); 9 Jun 2015 07:14:53 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2015 07:14:53 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 00C80CCAEF for ; Tue, 9 Jun 2015 07:14:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id OOZWlncBqcF7 for ; Tue, 9 Jun 2015 07:14:49 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 852C642AD6 for ; Tue, 9 Jun 2015 07:14:48 +0000 (UTC) Received: (qmail 91185 invoked by uid 99); 9 Jun 2015 07:14:47 -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, 09 Jun 2015 07:14:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CC9FDDFF16; Tue, 9 Jun 2015 07:14:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 09 Jun 2015 07:14:49 -0000 Message-Id: <0f86a6e07b714812b3a3ebd79ec4c903@git.apache.org> In-Reply-To: <1d5b7f2b6b4a47adaa2cad75202914c5@git.apache.org> References: <1d5b7f2b6b4a47adaa2cad75202914c5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-883_1' into ignite-client-bench Merge remote-tracking branch 'remotes/origin/ignite-883_1' into ignite-client-bench Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ba67988 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ba67988 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ba67988 Branch: refs/heads/ignite-client-bench Commit: 5ba67988eba5f7ea6e32aa5b39f7a884fe901072 Parents: faaa719 eb0e2db Author: sboikov Authored: Tue Jun 9 10:13:45 2015 +0300 Committer: sboikov Committed: Tue Jun 9 10:13:45 2015 +0300 ---------------------------------------------------------------------- .../processors/affinity/GridAffinityAssignment.java | 12 ++++++++++++ .../affinity/GridAffinityAssignmentCache.java | 4 ++-- .../dht/atomic/GridNearAtomicUpdateFuture.java | 6 +++++- .../preloader/GridDhtPartitionsExchangeFuture.java | 14 +++++++++----- .../java/org/apache/ignite/spi/IgniteSpiAdapter.java | 10 ++++++++-- 5 files changed, 36 insertions(+), 10 deletions(-) ----------------------------------------------------------------------