Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7fcd6fc9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7fcd6fc9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7fcd6fc9 Branch: refs/heads/ignite-2324 Commit: 7fcd6fc92861659e1d3f5df08a866743d1574cba Parents: 5bb1fb8 76c0ae3 Author: sboikov <[email protected]> Authored: Thu Jan 21 16:16:13 2016 +0300 Committer: sboikov <[email protected]> Committed: Thu Jan 21 16:16:13 2016 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) ----------------------------------------------------------------------
