[18/18] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-3

[sboikov]

Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-3

Conflicts:
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java


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

Branch: refs/heads/ignite-1093-3
Commit: 9521c6815674fa55854894e7921f9d05de61230c
Parents: 5f81df8
Author: Anton Vinogradov <a...@apache.org>
Authored: Thu Nov 5 10:57:49 2015 +0300
Committer: Anton Vinogradov <a...@apache.org>
Committed: Thu Nov 5 10:57:49 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCachePreloaderAdapter.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9521c681/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
index 917f895..9c0e9f7 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
@@ -173,4 +173,14 @@ public class GridCachePreloaderAdapter implements 
GridCachePreloader {
     @Override public void evictPartitionAsync(GridDhtLocalPartition part) {
         // No-op.
     }
-}
\ No newline at end of file
+
+    /** {@inheritDoc} */
+    @Override public void onTopologyChanged(AffinityTopologyVersion topVer) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void dumpDebugInfo() {
+        // No-op.
+    }
+}