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 5321A18605 for ; Thu, 16 Jul 2015 22:59:25 +0000 (UTC) Received: (qmail 90453 invoked by uid 500); 16 Jul 2015 22:59:25 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 90416 invoked by uid 500); 16 Jul 2015 22:59:25 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 90401 invoked by uid 99); 16 Jul 2015 22:59:25 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jul 2015 22:59:25 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 05C16C0910 for ; Thu, 16 Jul 2015 22:59:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id IY6Nx1SeaxFo for ; Thu, 16 Jul 2015 22:59:24 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id E260C267C5 for ; Thu, 16 Jul 2015 22:59:16 +0000 (UTC) Received: (qmail 88241 invoked by uid 99); 16 Jul 2015 22:58:01 -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; Thu, 16 Jul 2015 22:58:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8CB3AE682E; Thu, 16 Jul 2015 22:58:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 16 Jul 2015 22:58:22 -0000 Message-Id: <4b4a7ba4581148a08a73784c3ed89cfa@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [22/50] [abbrv] incubator-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/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 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(-) ----------------------------------------------------------------------