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 87CDA18BF2 for ; Tue, 13 Oct 2015 15:16:54 +0000 (UTC) Received: (qmail 48395 invoked by uid 500); 13 Oct 2015 15:16:32 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 48363 invoked by uid 500); 13 Oct 2015 15:16:32 -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 48354 invoked by uid 99); 13 Oct 2015 15:16:32 -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, 13 Oct 2015 15:16:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 537D5E0944; Tue, 13 Oct 2015 15:16:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Tue, 13 Oct 2015 15:16:42 -0000 Message-Id: <56aa0eec562e48718da4976fadbf05d2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/21] ignite git commit: ignite-1526: fixed merging conflicts ignite-1526: fixed merging conflicts Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6afc2fc3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6afc2fc3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6afc2fc3 Branch: refs/heads/ignite-1093-2 Commit: 6afc2fc3ca390dad7834105b53804b89f50aecf2 Parents: 5fc682f Author: Andrey Gura Authored: Fri Oct 9 14:23:34 2015 +0300 Committer: Denis Magda Committed: Fri Oct 9 14:23:34 2015 +0300 ---------------------------------------------------------------------- .../testframework/junits/multijvm/IgniteCacheProcessProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6afc2fc3/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java index 04d7893..02c6a26 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java @@ -553,7 +553,7 @@ public class IgniteCacheProcessProxy implements IgniteCache { Collection> res = new ArrayList<>(); for (Entry e : cache().localEntries(peekModes)) - res.add(new CacheEntryImpl<>(e.getKey(), e.getValue())); + res.add(e); return res; }