Merge remote-tracking branch 'remotes/origin/master' into ignite-5075
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c7640e2f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c7640e2f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c7640e2f Branch: refs/heads/ignite-5075 Commit: c7640e2f73874aa7cfa608db668751d4cd68d2be Parents: 19cc1cb ac85a7a Author: sboikov <sboi...@gridgain.com> Authored: Thu May 18 12:17:34 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu May 18 12:17:34 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgniteNeedReconnectException.java | 2 +- .../ignite/internal/managers/discovery/GridDiscoveryManager.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c7640e2f/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ----------------------------------------------------------------------
