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 9390518CF8 for ; Wed, 6 May 2015 12:16:52 +0000 (UTC) Received: (qmail 32151 invoked by uid 500); 6 May 2015 12:16:52 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 32118 invoked by uid 500); 6 May 2015 12:16:52 -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 32067 invoked by uid 99); 6 May 2015 12:16:52 -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 12:16:52 +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 12:16:47 +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 48F1443E67 for ; Wed, 6 May 2015 12:16:27 +0000 (UTC) Received: (qmail 30319 invoked by uid 99); 6 May 2015 12:16:26 -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 12:16:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C30AFE17E4; Wed, 6 May 2015 12:16:26 +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 12:16:30 -0000 Message-Id: <3ef12fa8ee1846c58a183bbb87a70d57@git.apache.org> In-Reply-To: <75abafe7e5b04984bbec4fd67a5d9dd2@git.apache.org> References: <75abafe7e5b04984bbec4fd67a5d9dd2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] incubator-ignite git commit: Merge branch 'ignite-848' into ignite-sprint-4 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-848' 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/4accd3ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4accd3ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4accd3ad Branch: refs/heads/ignite-sprint-4 Commit: 4accd3ad3a268f76507254af2c46f1f89039db9b Parents: 91b2764 70872aa Author: agura Authored: Wed May 6 14:53:06 2015 +0300 Committer: agura Committed: Wed May 6 14:53:06 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMapEntry.java | 18 ++++- .../processors/cache/GridCacheTtlManager.java | 42 ++++------ .../processors/cache/GridCacheUtils.java | 5 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../datastreamer/DataStreamerImpl.java | 2 + .../IgniteCacheExpiryPolicyAbstractTest.java | 2 +- .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../expiry/IgniteCacheTtlCleanupSelfTest.java | 85 ++++++++++++++++++++ 8 files changed, 121 insertions(+), 37 deletions(-) ----------------------------------------------------------------------