Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BEAA1200B2C for ; Tue, 24 May 2016 13:13:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BD88C160A01; Tue, 24 May 2016 11:13:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 225DE160A33 for ; Tue, 24 May 2016 13:13:01 +0200 (CEST) Received: (qmail 2234 invoked by uid 500); 24 May 2016 11:13:01 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 2083 invoked by uid 99); 24 May 2016 11:13:01 -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, 24 May 2016 11:13:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 05434E97D4; Tue, 24 May 2016 11:13:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Tue, 24 May 2016 11:13:07 -0000 Message-Id: <6ba871506f154da3bfc11030a58241fd@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/10] ignite git commit: Merge branch 'IGNITE-2693' of https://github.com/oddodaoddo/ignite into ignite-2693 archived-at: Tue, 24 May 2016 11:13:02 -0000 Merge branch 'IGNITE-2693' of https://github.com/oddodaoddo/ignite into ignite-2693 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/41968370 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/41968370 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/41968370 Branch: refs/heads/ignite-2693 Commit: 419683708630d0406030332d1c12cd5ed402387a Parents: 46892c7 31c2dc0 Author: vozerov-gridgain Authored: Tue May 24 12:17:54 2016 +0300 Committer: vozerov-gridgain Committed: Tue May 24 12:17:54 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 6 +- ...heOffHeapTieredEvictionAbstractSelfTest.java | 9 ++- .../junits/CacheWithKeepBinarySelfTest.java | 77 ++++++++++++++++++++ 4 files changed, 91 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/41968370/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/41968370/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------