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 6D91D18F3A for ; Wed, 29 Apr 2015 13:56:38 +0000 (UTC) Received: (qmail 16238 invoked by uid 500); 29 Apr 2015 13:56:38 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 16208 invoked by uid 500); 29 Apr 2015 13:56:38 -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 16199 invoked by uid 99); 29 Apr 2015 13:56:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 13:56:38 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [54.76.25.247] (HELO mx1-eu-west.apache.org) (54.76.25.247) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 13:56:13 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id B6E5B2AABB for ; Wed, 29 Apr 2015 13:56:11 +0000 (UTC) Received: (qmail 6266 invoked by uid 99); 29 Apr 2015 13:54:54 -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, 29 Apr 2015 13:54:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1CAE8E3597; Wed, 29 Apr 2015 13:54:54 +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: Wed, 29 Apr 2015 13:55:22 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [30/50] incubator-ignite git commit: Merge branches 'ignite-gg-9830' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-gg-9830' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e0a19d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e0a19d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e0a19d4 Branch: refs/heads/ignite-545 Commit: 7e0a19d432b21b0d9561ecf2dcb51b4b11af2ec2 Parents: 6932fc6 f0000bd Author: AKuznetsov Authored: Tue Apr 28 20:18:25 2015 +0700 Committer: AKuznetsov Committed: Tue Apr 28 20:18:25 2015 +0700 ---------------------------------------------------------------------- .../eviction/sorted/SortedEvictionPolicy.java | 2 +- .../distributed/dht/GridDhtLockRequest.java | 38 +++++++------- .../distributed/near/GridNearLockRequest.java | 54 ++++++++++---------- 3 files changed, 47 insertions(+), 47 deletions(-) ----------------------------------------------------------------------