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 EBFF017ADC for ; Fri, 19 Jun 2015 10:35:14 +0000 (UTC) Received: (qmail 19545 invoked by uid 500); 19 Jun 2015 10:35:14 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 19515 invoked by uid 500); 19 Jun 2015 10:35:14 -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 19506 invoked by uid 99); 19 Jun 2015 10:35:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jun 2015 10:35:14 +0000 X-ASF-Spam-Status: No, hits=-2000.4 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 19 Jun 2015 10:33:03 +0000 Received: (qmail 16646 invoked by uid 99); 19 Jun 2015 10:34: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; Fri, 19 Jun 2015 10:34:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1FF2DE025B; Fri, 19 Jun 2015 10:34: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: Fri, 19 Jun 2015 10:35:24 -0000 Message-Id: <28e04cc52d5a4b6e8d9b51c685994f43@git.apache.org> In-Reply-To: <8fcf0bc831e74bd4876a9163537f1b2b@git.apache.org> References: <8fcf0bc831e74bd4876a9163537f1b2b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [38/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1003' into ignite-sprint-6 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-1003' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d1fa723 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d1fa723 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d1fa723 Branch: refs/heads/ignite-950 Commit: 4d1fa7235c1381bacaaeaf458658675d2ba34923 Parents: 31cf802 b23f930 Author: sboikov Authored: Thu Jun 18 15:15:49 2015 +0300 Committer: sboikov Committed: Thu Jun 18 15:15:49 2015 +0300 ---------------------------------------------------------------------- .../communication/tcp/TcpCommunicationSpi.java | 38 ++++++++++---------- .../ignite/spi/discovery/tcp/ServerImpl.java | 21 +++++++---- .../spi/discovery/tcp/TcpDiscoverySpi.java | 9 ++++- .../tcp/internal/TcpDiscoveryNode.java | 18 ++++++++++ 4 files changed, 60 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d1fa723/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d1fa723/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d1fa723/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ----------------------------------------------------------------------