Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-565
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de53fbbe Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de53fbbe Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de53fbbe Branch: refs/heads/gg-9869 Commit: de53fbbe9576d52013bbfbeacbb6c4dee2f4a69f Parents: 75ea413 ea90377 Author: sboikov <sboi...@gridgain.com> Authored: Thu Mar 26 16:06:14 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Mar 26 16:06:14 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/managers/discovery/GridDiscoveryManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
