[45/46] ignite git commit: Merge branch 'ignite-1282' into ignite-1819

[vozerov]

Merge branch 'ignite-1282' into ignite-1819

Conflicts:
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa9512b7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa9512b7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aa9512b7

Branch: refs/heads/ignite-1819
Commit: aa9512b74b4d60b0a922beafbb1b77669c517e04
Parents: b7b8b4a 76b65b2
Author: vozerov-gridgain <voze...@gridgain.com>
Authored: Thu Nov 5 15:19:04 2015 +0300
Committer: vozerov-gridgain <voze...@gridgain.com>
Committed: Thu Nov 5 15:19:04 2015 +0300

----------------------------------------------------------------------
 .../cache/portable/CacheObjectPortableProcessorImpl.java         | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/aa9512b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java
----------------------------------------------------------------------
diff --cc 
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java
index 752abf7,b687666..88240bc
--- 
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
@@@ -39,9 -39,9 +39,13 @@@ import javax.cache.processor.EntryProce
  import javax.cache.processor.MutableEntry;
  import org.apache.ignite.IgniteCheckedException;
  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;