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 1E76D18892 for ; Thu, 11 Jun 2015 18:18:10 +0000 (UTC) Received: (qmail 31766 invoked by uid 500); 11 Jun 2015 18:18:10 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 31734 invoked by uid 500); 11 Jun 2015 18:18:10 -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 31725 invoked by uid 99); 11 Jun 2015 18:18:10 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jun 2015 18:18:10 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 9BDA8CD4EF for ; Thu, 11 Jun 2015 18:18:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-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-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id P4R0WIikbU0T for ; Thu, 11 Jun 2015 18:18:01 +0000 (UTC) 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 80E032541E for ; Thu, 11 Jun 2015 18:18:00 +0000 (UTC) Received: (qmail 30803 invoked by uid 99); 11 Jun 2015 18:17:59 -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; Thu, 11 Jun 2015 18:17:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A263EE091F; Thu, 11 Jun 2015 18:17:59 +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: Thu, 11 Jun 2015 18:18:04 -0000 Message-Id: In-Reply-To: <19398bda81bd488b94841203deba91d0@git.apache.org> References: <19398bda81bd488b94841203deba91d0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/8] incubator-ignite git commit: Merge branch 'ignite-gg-10249' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10052 Merge branch 'ignite-gg-10249' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10052 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1048d554 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1048d554 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1048d554 Branch: refs/heads/ignite-gg-10249 Commit: 1048d554d08f58db20c3764c9ab915b74775b174 Parents: 9cbecbc b76ed93 Author: iveselovskiy Authored: Thu Jun 11 20:50:38 2015 +0300 Committer: iveselovskiy Committed: Thu Jun 11 20:50:38 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/swapspace/SwapSpaceSpi.java | 10 +-- .../cache/GridCacheSwapReloadSelfTest.java | 8 +-- .../cache/IgniteCachePeekModesAbstractTest.java | 12 ++++ .../GridSwapSpaceSpiAbstractSelfTest.java | 73 ++++++++++++++------ 4 files changed, 72 insertions(+), 31 deletions(-) ----------------------------------------------------------------------