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 A6188200C1D for ; Wed, 1 Feb 2017 08:30:36 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A24D1160B6C; Wed, 1 Feb 2017 07:30:36 +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 1C3EE160B66 for ; Wed, 1 Feb 2017 08:30:35 +0100 (CET) Received: (qmail 67430 invoked by uid 500); 1 Feb 2017 07:30:35 -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 67348 invoked by uid 99); 1 Feb 2017 07:30:35 -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; Wed, 01 Feb 2017 07:30:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 004F6DFE46; Wed, 1 Feb 2017 07:30:34 +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: Wed, 01 Feb 2017 07:30:38 -0000 Message-Id: <971ac5c5b52046439a25c66dabbcab14@git.apache.org> In-Reply-To: <32c3c11c116f461d958a64df85c11f10@git.apache.org> References: <32c3c11c116f461d958a64df85c11f10@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/9] ignite git commit: Merge branch 'ignite-db-x' of https://github.com/gridgain/apache-ignite into ignite-db-x archived-at: Wed, 01 Feb 2017 07:30:36 -0000 Merge branch 'ignite-db-x' of https://github.com/gridgain/apache-ignite into ignite-db-x Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae97143e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae97143e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae97143e Branch: refs/heads/ignite-3477-compact Commit: ae97143e86073e600c78c5d82452cf8bc956dd91 Parents: 587a05e 9773ea7 Author: Alexey Goncharuk Authored: Tue Jan 31 17:59:55 2017 +0300 Committer: Alexey Goncharuk Committed: Tue Jan 31 17:59:55 2017 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionDemander.java | 58 ++++--- .../ignite/internal/util/IgniteUtils.java | 16 ++ .../near/IgniteCacheNearOnlyTxTest.java | 3 +- .../TxOptimisticDeadlockDetectionTest.java | 12 +- .../junits/common/GridCommonAbstractTest.java | 170 ++++++++++++++++--- 5 files changed, 210 insertions(+), 49 deletions(-) ----------------------------------------------------------------------