[11/11] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537

[sboikov]

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537

Conflicts:
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java
        
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java


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

Branch: refs/heads/ignite-1537
Commit: 4b69eab2dfa986fbc4f1b41906c9f5d348020654
Parents: 9f158b9
Author: sboikov <sboi...@gridgain.com>
Authored: Thu Dec 24 09:09:23 2015 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Thu Dec 24 09:09:23 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/binary/CacheObjectBinaryProcessorImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4b69eab2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index 2209ec9..bcc2ab7 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -477,7 +477,7 @@ public class CacheObjectBinaryProcessorImpl extends 
IgniteCacheObjectProcessorIm
     }
 
     /** {@inheritDoc} */
-    public void addMeta(final int typeId, final BinaryType newMeta) {
+    @Override public void addMeta(final int typeId, final BinaryType newMeta) 
throws BinaryObjectException {
         assert newMeta != null;
         assert newMeta instanceof BinaryTypeImpl;