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 1B46317D3F for ; Tue, 5 May 2015 06:58:30 +0000 (UTC) Received: (qmail 1355 invoked by uid 500); 5 May 2015 06:58:30 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 1288 invoked by uid 500); 5 May 2015 06:58:30 -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 1272 invoked by uid 99); 5 May 2015 06:58:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2015 06:58:29 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2015 06:58:24 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id C9DF547356 for ; Tue, 5 May 2015 06:58:03 +0000 (UTC) Received: (qmail 95369 invoked by uid 99); 5 May 2015 06:56:48 -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; Tue, 05 May 2015 06:56:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5BE3DE3596; Tue, 5 May 2015 06:56:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 05 May 2015 06:57:23 -0000 Message-Id: <2c53f900275c443b85e5b7dc3daa2a7b@git.apache.org> In-Reply-To: <5c14eb09504746539e94c2c8f87b9094@git.apache.org> References: <5c14eb09504746539e94c2c8f87b9094@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [37/50] incubator-ignite git commit: Merge branches 'ignite-752' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-752' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/49a99233 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/49a99233 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/49a99233 Branch: refs/heads/ignite-157-2 Commit: 49a992339a34e28b29dbbd84aa5dede1614eebb5 Parents: 7121619 e0648d6 Author: Yakov Zhdanov Authored: Thu Apr 30 17:22:06 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Apr 30 17:22:06 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java | 4 ---- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 4 ---- .../ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 8 ++++---- .../ignite/spi/discovery/tcp/TcpClientDiscoverySelfTest.java | 8 ++++++++ 4 files changed, 12 insertions(+), 12 deletions(-) ----------------------------------------------------------------------