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 8655517AD4 for ; Wed, 6 May 2015 16:20:27 +0000 (UTC) Received: (qmail 50692 invoked by uid 500); 6 May 2015 16:20:27 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 50664 invoked by uid 500); 6 May 2015 16:20:27 -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 50654 invoked by uid 99); 6 May 2015 16:20:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 May 2015 16:20:27 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 May 2015 16:20:22 +0000 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 E754248CF8 for ; Wed, 6 May 2015 16:19:40 +0000 (UTC) Received: (qmail 49320 invoked by uid 99); 6 May 2015 16:19:40 -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, 06 May 2015 16:19:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 68A83E0772; Wed, 6 May 2015 16:19:40 +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, 06 May 2015 16:20:01 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [23/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/71216191 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71216191 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71216191 Branch: refs/heads/ignite-648 Commit: 71216191625c6d3f577c2e6e27bcb2c8f81d9a6b Parents: 53996a1 d8ced90 Author: avinogradov Authored: Thu Apr 30 15:55:15 2015 +0300 Committer: avinogradov Committed: Thu Apr 30 15:55:15 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheTtlManager.java | 168 ++++++++++++------- .../processors/cache/GridCacheUtils.java | 5 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- 3 files changed, 115 insertions(+), 62 deletions(-) ----------------------------------------------------------------------