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 616EF18559 for ; Thu, 16 Jul 2015 15:51:07 +0000 (UTC) Received: (qmail 17752 invoked by uid 500); 16 Jul 2015 15:51:07 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 17720 invoked by uid 500); 16 Jul 2015 15:51:07 -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 17711 invoked by uid 99); 16 Jul 2015 15:51:07 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jul 2015 15:51:07 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id C9235D5224 for ; Thu, 16 Jul 2015 15:51:06 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.483 X-Spam-Level: X-Spam-Status: No, score=0.483 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.317] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id btfe49_bbM1i for ; Thu, 16 Jul 2015 15:50:51 +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 6E2582AD34 for ; Thu, 16 Jul 2015 15:50:42 +0000 (UTC) Received: (qmail 14760 invoked by uid 99); 16 Jul 2015 15:50:42 -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 15:50:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DEFFDE3AAD; Thu, 16 Jul 2015 15:50:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ivasilinets@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 16 Jul 2015 15:51:14 -0000 Message-Id: <89743159734443798d7166a8791314f8@git.apache.org> In-Reply-To: <2634c240f2054ab2b85630bb68d42464@git.apache.org> References: <2634c240f2054ab2b85630bb68d42464@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [34/36] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-890' Merge remote-tracking branch 'remotes/origin/ignite-890' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44043fa2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44043fa2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44043fa2 Branch: refs/heads/ignite-961 Commit: 44043fa23ecd282fa69521faaaaa3ef74630f8da Parents: fbc38d7 5c55812 Author: Denis Magda Authored: Thu Jul 16 16:36:48 2015 +0300 Committer: Denis Magda Committed: Thu Jul 16 16:36:48 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 14 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 35 ++++- .../tcp/TcpDiscoveryMultiThreadedTest.java | 140 ++++++++++++------- 4 files changed, 131 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44043fa2/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44043fa2/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44043fa2/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ----------------------------------------------------------------------