Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6755A188A2 for ; Mon, 7 Sep 2015 20:46:32 +0000 (UTC) Received: (qmail 14374 invoked by uid 500); 7 Sep 2015 20:46:29 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 14257 invoked by uid 500); 7 Sep 2015 20:46:29 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 13949 invoked by uid 99); 7 Sep 2015 20:46:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2015 20:46:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5DC6E051C; Mon, 7 Sep 2015 20:46:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.apache.org Date: Mon, 07 Sep 2015 20:46:40 -0000 Message-Id: <095c330e3c1d42408873dedb11ed280e@git.apache.org> In-Reply-To: <9bce231ec239476dad68cda0dad0a0bc@git.apache.org> References: <9bce231ec239476dad68cda0dad0a0bc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1085' Merge remote-tracking branch 'remotes/origin/ignite-1085' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/77da7288 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/77da7288 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/77da7288 Branch: refs/heads/ignite-788-dev Commit: 77da7288f61868cf344fde68ced65cfe747d765b Parents: cd3a9b6 d11fc9b Author: Denis Magda Authored: Thu Jul 16 09:05:06 2015 +0300 Committer: Denis Magda Committed: Thu Jul 16 09:05:06 2015 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 35 ++++++++++++-------- 1 file changed, 22 insertions(+), 13 deletions(-) ----------------------------------------------------------------------