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 5C22D18CF9 for ; Wed, 20 Jan 2016 12:02:41 +0000 (UTC) Received: (qmail 54419 invoked by uid 500); 20 Jan 2016 12:02:41 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 54321 invoked by uid 500); 20 Jan 2016 12:02:41 -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 54215 invoked by uid 99); 20 Jan 2016 12:02:41 -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, 20 Jan 2016 12:02:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0CD54E38B7; Wed, 20 Jan 2016 12:02:41 +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: Wed, 20 Jan 2016 12:02:46 -0000 Message-Id: <77f52ef0a47542de87d76eac58a338b5@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/7] ignite git commit: Merge branch 'master' into ignite-2236 Merge branch 'master' into ignite-2236 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/879ef687 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/879ef687 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/879ef687 Branch: refs/heads/ignite-2236 Commit: 879ef68751a89f5b1e66793c46bb7562af81a088 Parents: 384b397 27c9064 Author: vozerov-gridgain Authored: Wed Jan 20 15:02:26 2016 +0300 Committer: vozerov-gridgain Committed: Wed Jan 20 15:02:26 2016 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 2 +- .../processors/cluster/ClusterProcessor.java | 37 +++++++--- .../Cache/CacheAbstractTest.cs | 72 ++++++++++++++------ .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 2 +- .../Impl/Unmanaged/UnmanagedUtils.cs | 6 +- 5 files changed, 81 insertions(+), 38 deletions(-) ----------------------------------------------------------------------