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 8BA9D200B60 for ; Mon, 4 Jul 2016 05:46:43 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8A674160A73; Mon, 4 Jul 2016 03:46:43 +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 DCAB9160A71 for ; Mon, 4 Jul 2016 05:46:42 +0200 (CEST) Received: (qmail 58390 invoked by uid 500); 4 Jul 2016 03:46:42 -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 57845 invoked by uid 99); 4 Jul 2016 03:46:40 -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; Mon, 04 Jul 2016 03:46:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2C39DEAD99; Mon, 4 Jul 2016 03:46:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Mon, 04 Jul 2016 03:46:50 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/14] ignite git commit: Merge remote-tracking branch 'upstream/master' into IGNITE-3227 archived-at: Mon, 04 Jul 2016 03:46:43 -0000 Merge remote-tracking branch 'upstream/master' into IGNITE-3227 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f4c509f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f4c509f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f4c509f Branch: refs/heads/ignite-3227 Commit: 9f4c509f57c39e418ca82d893375b667bffc1682 Parents: 4b08a7a 27b032e Author: samaitra Authored: Fri Jul 1 00:02:57 2016 +0530 Committer: samaitra Committed: Fri Jul 1 00:02:57 2016 +0530 ---------------------------------------------------------------------- .../integration/ClientAbstractSelfTest.java | 4 +- .../JettyRestProcessorAbstractSelfTest.java | 57 ++--- .../org/apache/ignite/cache/QueryEntity.java | 18 ++ .../affinity/PlatformAffinityFunction.java | 24 ++- .../PlatformDotNetConfigurationClosure.java | 41 ++++ .../services/PlatformAbstractService.java | 3 +- .../handlers/cache/GridCacheCommandHandler.java | 16 +- .../dotnet/PlatformDotNetAffinityFunction.java | 211 +++++++++++++++++++ .../processors/igfs/IgfsStreamsSelfTest.java | 5 +- .../cache/GridCacheCommandHandlerSelfTest.java | 1 + ...IgniteCachePrimitiveFieldsQuerySelfTest.java | 134 ++++++++++++ modules/platforms/cpp/core-test/Makefile.am | 1 + .../cpp/core-test/project/vs/core-test.vcxproj | 1 + .../project/vs/core-test.vcxproj.filters | 3 + .../cpp/core-test/src/interop_test.cpp | 148 +++++++++++++ .../Apache.Ignite.Core.Tests.csproj | 4 + .../Affinity/AffinityFunctionSpringTest.cs | 132 ++++++++++++ .../Cache/Affinity/AffinityFunctionTest.cs | 26 +++ .../Cache/Query/CacheLinqTest.cs | 7 +- .../Compute/ComputeApiTest.cs | 42 ++-- .../Config/Cache/Affinity/affinity-function.xml | 87 ++++++++ .../Services/ServicesTest.cs | 1 + .../Apache.Ignite.Core.Tests/TestRunner.cs | 2 +- .../Cache/Affinity/AffinityFunctionBase.cs | 13 ++ .../dotnet/Apache.Ignite.Core/Ignition.cs | 41 ++-- .../Impl/Cache/Store/CacheStore.cs | 4 +- .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 12 +- .../Impl/Services/Services.cs | 17 +- .../Impl/Unmanaged/UnmanagedCallbacks.cs | 15 +- .../cache/websession/WebSessionFilter.java | 7 +- .../ignite/cache/websession/WebSessionV2.java | 10 +- 31 files changed, 991 insertions(+), 96 deletions(-) ----------------------------------------------------------------------