Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/62cd664b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62cd664b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62cd664b Branch: refs/heads/ignite-496 Commit: 62cd664bb2b0135f07a646a190d41c7c41561153 Parents: 1953cb1 ea90377 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Mar 26 16:30:09 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Mar 26 16:30:09 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/managers/discovery/GridDiscoveryManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
