IGNITE-1819: Fix after merge.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3e991684 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3e991684 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3e991684 Branch: refs/heads/ignite-1819 Commit: 3e991684167229e7de48c684079a17f733493bd5 Parents: aa9512b Author: vozerov-gridgain <[email protected]> Authored: Thu Nov 5 15:19:47 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Nov 5 15:19:47 2015 +0300 ---------------------------------------------------------------------- .../cache/portable/CacheObjectPortableProcessorImpl.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3e991684/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java index 88240bc..f189052 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java @@ -42,10 +42,7 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.IgnitePortables; import org.apache.ignite.cluster.ClusterTopologyException; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; -import org.apache.ignite.internal.portable.api.IgnitePortables; -======= import org.apache.ignite.IgnitePortables; ->>>>>>> Temporary merge branch 2 import org.apache.ignite.cache.CacheEntryEventSerializableFilter; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration;
