[35/35] ignite git commit: Merge remote-tracking branch 'remotes/upstream/ignite-1.5' into ignite-1626

[vozerov]

Merge remote-tracking branch 'remotes/upstream/ignite-1.5' into ignite-1626

Conflicts:
        
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java


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

Branch: refs/heads/ignite-1626
Commit: 4095c36cd8696a0b65d420dfd753577adbb60a89
Parents: b7296a2
Author: Pavel Tupitsyn <ptupit...@gridgain.com>
Authored: Thu Dec 3 16:16:30 2015 +0300
Committer: Pavel Tupitsyn <ptupit...@gridgain.com>
Committed: Thu Dec 3 16:16:30 2015 +0300

----------------------------------------------------------------------
 .../cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java        | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4095c36c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index 6f8ca2d..411e363 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import javax.cache.CacheException;
 import org.apache.ignite.cache.query.ScanQuery;
 import org.apache.ignite.cache.query.SqlQuery;
@@ -76,10 +75,6 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest 
extends IgniteCacheP2pUnm
                 private void readObject(ObjectInputStream is) throws 
IOException {
                     throw new IOException();
                 }
-
-                private void writeObject(ObjectOutputStream os) throws 
IOException {
-                    throw new IOException();
-                }
             })).getAll();
 
             assertTrue("Request unmarshalling failed, but error response was 
not sent.", portableMarshaller());