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 C4DBD10B94 for ; Tue, 5 May 2015 15:26:44 +0000 (UTC) Received: (qmail 45870 invoked by uid 500); 5 May 2015 15:26:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 45798 invoked by uid 500); 5 May 2015 15:26:44 -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 45788 invoked by uid 99); 5 May 2015 15:26:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2015 15:26:44 +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: domain of root@apache.org designates 54.191.145.13 as permitted sender) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2015 15:26:39 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 7E8C324EAA for ; Tue, 5 May 2015 15:25:55 +0000 (UTC) Received: (qmail 43689 invoked by uid 99); 5 May 2015 15:25:55 -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, 05 May 2015 15:25:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4BE7BE30F3; Tue, 5 May 2015 15:25:55 +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: Tue, 05 May 2015 15:26:16 -0000 Message-Id: <8694718d2aa242a0aebe04cbf5829b48@git.apache.org> In-Reply-To: <10b7a83cfbe04db78c4e7e768970b139@git.apache.org> References: <10b7a83cfbe04db78c4e7e768970b139@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/50] incubator-ignite git commit: Merge branch 'ignite-728' into ignite-sprint-4 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-728' 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/d8ced90e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d8ced90e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d8ced90e Branch: refs/heads/ignite-664 Commit: d8ced90e512a71e8131329bdc37a936e88f55c3a Parents: 2a176e4 65780ec5 Author: agura Authored: Thu Apr 30 15:40:30 2015 +0300 Committer: agura Committed: Thu Apr 30 15:40:30 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheTtlManager.java | 168 ++++++++++++------- .../processors/cache/GridCacheUtils.java | 5 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- 3 files changed, 115 insertions(+), 62 deletions(-) ----------------------------------------------------------------------