Merge with 1.8.5. Compilation fix.

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

Branch: refs/heads/ignite-1192
Commit: d449493a2806055eeed4c37832bf73b08f897ad8
Parents: 513ca3a
Author: dkarachentsev <[email protected]>
Authored: Mon Apr 3 12:22:32 2017 +0300
Committer: dkarachentsev <[email protected]>
Committed: Mon Apr 3 12:22:32 2017 +0300

----------------------------------------------------------------------
 .../apache/ignite/testframework/junits/GridTestKernalContext.java   | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d449493a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
index 40f0e43..a579094 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
@@ -65,6 +65,7 @@ public class GridTestKernalContext extends 
GridKernalContextImpl {
                 null,
                 null,
                 null,
+                null,
                 U.allPluginProviders()
         );
 

Reply via email to