You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/06/28 13:07:33 UTC
[46/50] [abbrv] ignite git commit: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/34fc31e8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/34fc31e8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/34fc31e8
Branch: refs/heads/ignite-1232
Commit: 34fc31e87b3e5f5c31f68421d7200c8848bb6e20
Parents: 6e5061d 8ec6db5
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Jun 27 10:22:16 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Jun 27 10:22:16 2016 +0700
----------------------------------------------------------------------
.../GridAffinityFunctionContextImpl.java | 9 +
.../platform/PlatformProcessorImpl.java | 35 +--
.../affinity/PlatformAffinityFunction.java | 242 +++++++++++++++
.../callback/PlatformCallbackGateway.java | 90 +++++-
.../callback/PlatformCallbackUtils.java | 46 +++
.../dotnet/PlatformDotNetCacheStore.java | 27 +-
.../utils/PlatformConfigurationUtils.java | 13 +-
.../apache/ignite/resources/SpringResource.java | 15 +-
.../platforms/cpp/jni/include/ignite/jni/java.h | 19 +-
modules/platforms/cpp/jni/src/java.cpp | 35 ++-
.../Apache.Ignite.Core.Tests.csproj | 5 +-
.../Binary/BinarySelfTest.cs | 138 +++++---
.../Cache/Affinity/AffinityFieldTest.cs | 199 ++++++++++++
.../Cache/Affinity/AffinityFunctionTest.cs | 282 +++++++++++++++++
.../Cache/Affinity/AffinityTest.cs | 138 ++++++++
.../Cache/CacheAffinityFieldTest.cs | 199 ------------
.../Cache/CacheAffinityTest.cs | 139 ---------
.../Cache/CacheConfigurationTest.cs | 6 +-
.../Cache/Store/CacheStoreTest.cs | 11 +-
.../native-client-test-cache-affinity.xml | 2 +-
.../IgniteConfigurationSerializerTest.cs | 14 +-
.../Apache.Ignite.Core.Tests/LifecycleTest.cs | 9 +
.../Apache.Ignite.Core.Tests/ReconnectTest.cs | 9 +
.../Apache.Ignite.Core.Tests/TestRunner.cs | 6 +-
.../Apache.Ignite.Core.Tests/TestUtils.cs | 4 +-
.../Apache.Ignite.Core.csproj | 3 +
.../Cache/Affinity/AffinityFunctionBase.cs | 102 +++++-
.../Cache/Affinity/AffinityFunctionContext.cs | 116 +++++++
.../Cache/Affinity/AffinityTopologyVersion.cs | 138 ++++++++
.../Cache/Affinity/IAffinityFunction.cs | 55 +++-
.../Cache/Configuration/CacheConfiguration.cs | 9 +-
.../Apache.Ignite.Core/Events/EventBase.cs | 2 +-
.../Apache.Ignite.Core/Events/EventReader.cs | 8 +-
.../dotnet/Apache.Ignite.Core/IIgnite.cs | 25 ++
.../IgniteConfigurationSection.xsd | 4 +-
.../dotnet/Apache.Ignite.Core/Ignition.cs | 25 +-
.../Impl/Binary/BinaryReflectiveActions.cs | 10 +-
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 38 ++-
.../Apache.Ignite.Core/Impl/IgniteProxy.cs | 37 ++-
.../Impl/LifecycleBeanHolder.cs | 2 +-
.../Impl/Unmanaged/UnmanagedCallbackHandlers.cs | 6 +
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 120 ++++++-
.../Lifecycle/ClientReconnectEventArgs.cs | 47 +++
.../dotnet/Apache.Ignite.sln.DotSettings | 7 +-
.../GridResourceSpringBeanInjector.java | 39 ++-
.../GridSpringResourceInjectionSelfTest.java | 311 ++++++++++++++++---
.../spring-resource-with-duplicate-beans.xml | 30 ++
.../processors/resource/spring-resource.xml | 2 +-
48 files changed, 2299 insertions(+), 529 deletions(-)
----------------------------------------------------------------------