Merge remote-tracking branch 'origin/ignite-187' into ignite-187
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4dd275b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4dd275b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4dd275b1 Branch: refs/heads/ignite-187 Commit: 4dd275b191dd87cd28976bbc2699862b6e988455 Parents: b184ee0 25b1e5a Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Mar 4 10:24:04 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Mar 4 10:24:04 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/managers/GridManagerAdapter.java | 5 +++++ .../internal/managers/discovery/GridDiscoveryManager.java | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
