Merge remote-tracking branch 'remotes/origin/ignite-1085'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/77da7288 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/77da7288 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/77da7288 Branch: refs/heads/ignite-1121 Commit: 77da7288f61868cf344fde68ced65cfe747d765b Parents: cd3a9b6 d11fc9b Author: Denis Magda <dma...@gridgain.com> Authored: Thu Jul 16 09:05:06 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Thu Jul 16 09:05:06 2015 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 35 ++++++++++++-------- 1 file changed, 22 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
