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 2DE9D200AF8 for ; Thu, 5 May 2016 17:36:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2C83F160A03; Thu, 5 May 2016 15:36:30 +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 748361609F3 for ; Thu, 5 May 2016 17:36:29 +0200 (CEST) Received: (qmail 36040 invoked by uid 500); 5 May 2016 15:36:28 -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 36031 invoked by uid 99); 5 May 2016 15:36:28 -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; Thu, 05 May 2016 15:36:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9274BDFBA8; Thu, 5 May 2016 15:36:28 +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 Message-Id: <70c17f9436de4c66aeada0f3a16fe960@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-2854 Deadlock since version updated Date: Thu, 5 May 2016 15:36:28 +0000 (UTC) archived-at: Thu, 05 May 2016 15:36:30 -0000 Repository: ignite Updated Branches: refs/heads/master d326e0577 -> 4b112197e ignite-2854 Deadlock since version updated Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b112197 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b112197 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b112197 Branch: refs/heads/master Commit: 4b112197e9b9695f49c22560119afb2f771f7f2a Parents: d326e05 Author: agura Authored: Thu May 5 18:36:07 2016 +0300 Committer: agura Committed: Thu May 5 18:36:07 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/transactions/IgniteTxManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4b112197/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index 40733cc..789ef8d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -123,7 +123,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { private static final int TX_SALVAGE_TIMEOUT = Integer.getInteger(IGNITE_TX_SALVAGE_TIMEOUT, 100); /** Version in which deadlock detection introduced. */ - public static final IgniteProductVersion TX_DEADLOCK_DETECTION_SINCE = IgniteProductVersion.fromString("1.5.15"); + public static final IgniteProductVersion TX_DEADLOCK_DETECTION_SINCE = IgniteProductVersion.fromString("1.5.19"); /** Deadlock detection maximum iterations. */ static final int DEADLOCK_MAX_ITERS =