Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3CF3A200C8C for ; Tue, 6 Jun 2017 17:26:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3B62C160BD3; Tue, 6 Jun 2017 15:26:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A897C160BC3 for ; Tue, 6 Jun 2017 17:26:01 +0200 (CEST) Received: (qmail 26268 invoked by uid 500); 6 Jun 2017 15:26:00 -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 26251 invoked by uid 99); 6 Jun 2017 15:26:00 -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, 06 Jun 2017 15:26:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C4805E00C4; Tue, 6 Jun 2017 15:26:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Tue, 06 Jun 2017 15:26:01 -0000 Message-Id: In-Reply-To: <1b1987d55d784bc9820638db516acd55@git.apache.org> References: <1b1987d55d784bc9820638db516acd55@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ignite git commit: Merge branches 'ignite-5314' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-5314 archived-at: Tue, 06 Jun 2017 15:26:02 -0000 Merge branches 'ignite-5314' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-5314 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/89ffc92f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/89ffc92f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/89ffc92f Branch: refs/heads/ignite-5314 Commit: 89ffc92f4aec7fbfb9d3cd7a7622d733a0995fdf Parents: 9cd711f 808ad9f Author: Alexey Kuznetsov Authored: Tue Jun 6 22:25:17 2017 +0700 Committer: Alexey Kuznetsov Committed: Tue Jun 6 22:25:17 2017 +0700 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 3 + .../GridCachePartitionExchangeManager.java | 129 ++++++++++--------- .../dht/GridDhtPartitionTopologyImpl.java | 6 +- .../GridDhtPartitionsExchangeFuture.java | 56 +++++--- 4 files changed, 117 insertions(+), 77 deletions(-) ----------------------------------------------------------------------