IGNITE-1282: 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/52d79998 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/52d79998 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/52d79998 Branch: refs/heads/ignite-gg-10760 Commit: 52d7999834bae4109cc4a4a36a6e0bee9bb91765 Parents: 964414c Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Sep 15 11:04:51 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Sep 15 11:04:51 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/portable/PortableContext.java | 3 --- .../platform/dotnet/PlatformDotNetConfigurationClosure.java | 1 - 2 files changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/52d79998/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java index 7c27813..6f6a407 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java @@ -61,9 +61,6 @@ import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.marshaller.MarshallerContext; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.internal.processors.platform.dotnet.PlatformDotNetConfiguration; -import org.apache.ignite.internal.processors.platform.dotnet.PlatformDotNetPortableConfiguration; -import org.apache.ignite.internal.processors.platform.dotnet.PlatformDotNetPortableTypeConfiguration; import org.apache.ignite.portable.PortableException; import org.apache.ignite.portable.PortableIdMapper; import org.apache.ignite.portable.PortableInvalidClassException; http://git-wip-us.apache.org/repos/asf/ignite/blob/52d79998/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java index 03f04c0..8662375 100644 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java +++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java @@ -36,7 +36,6 @@ import org.apache.ignite.internal.processors.platform.utils.PlatformUtils; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lifecycle.LifecycleBean; import org.apache.ignite.marshaller.Marshaller; -import org.apache.ignite.internal.portable.api.PortableMarshaller; import org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration; import org.apache.ignite.marshaller.portable.PortableMarshaller; import org.apache.ignite.platform.dotnet.PlatformDotNetLifecycleBean;