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 D633218228 for ; Wed, 8 Jul 2015 13:31:21 +0000 (UTC) Received: (qmail 18531 invoked by uid 500); 8 Jul 2015 13:31:21 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 18499 invoked by uid 500); 8 Jul 2015 13:31:21 -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 18490 invoked by uid 99); 8 Jul 2015 13:31:21 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jul 2015 13:31:21 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 5EF4B1A6B33 for ; Wed, 8 Jul 2015 13:31:21 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id xJ9IvCb1DRkT for ; Wed, 8 Jul 2015 13:31:20 +0000 (UTC) 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 D0E574C0EA for ; Wed, 8 Jul 2015 13:31:12 +0000 (UTC) Received: (qmail 18211 invoked by uid 99); 8 Jul 2015 13:31:12 -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, 08 Jul 2015 13:31:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2307BE3609; Wed, 8 Jul 2015 13:31:12 +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, 08 Jul 2015 13:31:38 -0000 Message-Id: <9e3eba8250a44a88b4279ea451f43af7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [28/50] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-591 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-591 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25c349f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25c349f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25c349f4 Branch: refs/heads/ignite-gg-10052 Commit: 25c349f47f70c9824c8d4ba9c4ee679ff597051e Parents: 5dc2d2b 9d0aa6f Author: Yakov Zhdanov Authored: Tue Jul 7 16:01:47 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Jul 7 16:01:47 2015 +0300 ---------------------------------------------------------------------- .../cache/eviction/fifo/FifoEvictionPolicy.java | 5 ----- .../cache/eviction/lru/LruEvictionPolicy.java | 5 ----- .../eviction/sorted/SortedEvictionPolicy.java | 19 +++++-------------- ...cheConcurrentEvictionConsistencySelfTest.java | 15 +++++++++++++-- 4 files changed, 18 insertions(+), 26 deletions(-) ----------------------------------------------------------------------