You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@ignite.apache.org by vo...@apache.org on 2016/11/17 10:52:12 UTC

[49/50] [abbrv] ignite git commit: Merge branch 'master' into ignite-2693

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5390868/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 2d0f8d8,297ec68..dc898fc
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@@ -63,7 -63,7 +63,8 @@@ import org.apache.ignite.internal.Async
  import org.apache.ignite.internal.GridKernalContext;
  import org.apache.ignite.internal.IgniteEx;
  import org.apache.ignite.internal.IgniteInternalFuture;
 +import org.apache.ignite.internal.binary.BinaryMarshaller;
+ import org.apache.ignite.internal.binary.BinaryUtils;
  import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
  import org.apache.ignite.internal.processors.cache.query.CacheQuery;
  import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture;

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5390868/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------