Repository: ignite Updated Branches: refs/heads/ignite-1232 4cbcbab54 -> a205d42c8
Fixes after merge Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/abd1c74b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/abd1c74b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/abd1c74b Branch: refs/heads/ignite-1232 Commit: abd1c74bda776896a8ba8096965f0c0c8aa9f955 Parents: c9a0b8c Author: Pavel Tupitsyn <[email protected]> Authored: Wed Jul 20 12:25:29 2016 +0300 Committer: Pavel Tupitsyn <[email protected]> Committed: Wed Jul 20 12:25:29 2016 +0300 ---------------------------------------------------------------------- .../platform/dotnet/PlatformDotNetConfigurationClosure.java | 5 ----- .../Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj | 1 - .../dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj | 3 --- 3 files changed, 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/abd1c74b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java index 0b00804..cb9696c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java @@ -23,20 +23,15 @@ import org.apache.ignite.binary.BinaryBasicIdMapper; import org.apache.ignite.binary.BinaryBasicNameMapper; import org.apache.ignite.binary.BinaryIdMapper; import org.apache.ignite.binary.BinaryNameMapper; -import org.apache.ignite.cache.affinity.AffinityFunction; -import org.apache.ignite.cache.affinity.fair.FairAffinityFunction; -import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.PlatformConfiguration; import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.internal.binary.BinaryRawReaderEx; import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.GridBinaryMarshaller; import org.apache.ignite.internal.processors.platform.PlatformAbstractConfigurationClosure; -import org.apache.ignite.internal.processors.platform.cache.affinity.PlatformAffinityFunction; import org.apache.ignite.internal.processors.platform.lifecycle.PlatformLifecycleBean; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; import org.apache.ignite.internal.processors.platform.memory.PlatformMemoryManagerImpl; http://git-wip-us.apache.org/repos/asf/ignite/blob/abd1c74b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj index 9373f35..5c10612 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj @@ -63,7 +63,6 @@ <Compile Include="Cache\Affinity\AffinityFunctionSpringTest.cs" /> <Compile Include="Cache\Affinity\AffinityFunctionTest.cs" /> <Compile Include="Cache\CacheConfigurationTest.cs" /> - <Compile Include="Cache\Affinity\AffinityFunctionSpringTest.cs" /> <Compile Include="Cache\CacheDynamicStartTest.cs" /> <Compile Include="Cache\CacheNearTest.cs" /> <Compile Include="Cache\CacheTestAsyncWrapper.cs" /> http://git-wip-us.apache.org/repos/asf/ignite/blob/abd1c74b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj index f6569b1..b0adf61 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj @@ -175,10 +175,7 @@ <Compile Include="Impl\Cache\Affinity\PlatformAffinityFunction.cs" /> <Compile Include="Impl\Common\ObjectInfoHolder.cs" /> <Compile Include="Impl\Common\Platform.cs" /> - <Compile Include="Impl\Cache\Affinity\AffinityFunctionSerializer.cs" /> - <Compile Include="Impl\Cache\Affinity\PlatformAffinityFunction.cs" /> <Compile Include="Impl\Cache\Event\JavaCacheEntryEventFilter.cs" /> - <Compile Include="Impl\Common\ObjectInfoHolder.cs" /> <Compile Include="Impl\Common\PlatformJavaObjectFactoryProxy.cs" /> <Compile Include="Compute\ComputeExecutionRejectedException.cs" /> <Compile Include="Compute\ComputeJobAdapter.cs" />
