Merge remote-tracking branch 'origin/ignite-1.3.3' into ignite-1.3.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a749ed80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a749ed80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a749ed80 Branch: refs/heads/ignite-104 Commit: a749ed80a669c1d770e918f982ec183097eb7783 Parents: f6b3b3d 960164a Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Wed Jul 22 13:22:08 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Wed Jul 22 13:22:08 2015 +0300 ---------------------------------------------------------------------- modules/core/src/main/java/org/apache/ignite/Ignite.java | 2 +- .../internal/managers/discovery/GridDiscoveryManager.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
