Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a847b8bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a847b8bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a847b8bc Branch: refs/heads/ignite-45 Commit: a847b8bce9d8fb57fe1658c4a5c436d80006e9d1 Parents: 8f315e6 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Mar 5 19:18:24 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Mar 5 19:18:24 2015 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a847b8bc/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index ad8f421..bd3b397 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -780,7 +780,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { gw.setState(STARTED); // Start discovery manager last to make sure that grid is fully initialized. - startManager(ctx, discoMgr); + startManager(discoMgr); } finally { gw.writeUnlock();
