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 AAE651822E for ; Thu, 21 May 2015 02:11:20 +0000 (UTC) Received: (qmail 36887 invoked by uid 500); 21 May 2015 02:11:19 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 36851 invoked by uid 500); 21 May 2015 02:11:19 -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 36838 invoked by uid 99); 21 May 2015 02:11:19 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 May 2015 02:11:19 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 5C8711828E3 for ; Thu, 21 May 2015 02:11:14 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-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 (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id ImtRtNQaweIv for ; Thu, 21 May 2015 02:11:14 +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 E238B262E0 for ; Thu, 21 May 2015 02:10:58 +0000 (UTC) Received: (qmail 35566 invoked by uid 99); 21 May 2015 02:10:58 -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, 21 May 2015 02:10:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8ABF8E442D; Thu, 21 May 2015 02:10:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 21 May 2015 02:11:26 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [29/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-timeout' into ignite-sprint-5 Merge branch 'ignite-timeout' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/15d55b1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/15d55b1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/15d55b1a Branch: refs/heads/ignite-80 Commit: 15d55b1a5fcaee7c91f450426bc537f3dffd77cf Parents: 36805cc df25d35 Author: nikolay tikhonov Authored: Mon May 18 14:49:20 2015 +0300 Committer: nikolay tikhonov Committed: Mon May 18 14:49:20 2015 +0300 ---------------------------------------------------------------------- .../spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------