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 11C2418435 for ; Mon, 29 Jun 2015 14:46:02 +0000 (UTC) Received: (qmail 75942 invoked by uid 500); 29 Jun 2015 14:46:01 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 75841 invoked by uid 500); 29 Jun 2015 14:46:01 -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 75792 invoked by uid 99); 29 Jun 2015 14:46:01 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2015 14:46:01 +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 30353D0F81 for ; Mon, 29 Jun 2015 14:46:01 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.21 X-Spam-Level: * X-Spam-Status: No, score=1.21 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, RP_MATCHES_RCVD=-0.571, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-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 IYBQ4yAg7TQT for ; Mon, 29 Jun 2015 14:46:00 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 83A102D916 for ; Mon, 29 Jun 2015 14:45:54 +0000 (UTC) Received: (qmail 71710 invoked by uid 99); 29 Jun 2015 14:45:51 -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; Mon, 29 Jun 2015 14:45:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0606AE35C6; Mon, 29 Jun 2015 14:45:51 +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: Mon, 29 Jun 2015 14:46:05 -0000 Message-Id: In-Reply-To: <1634f1df65e6431ab01da437cd95d265@git.apache.org> References: <1634f1df65e6431ab01da437cd95d265@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/30] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-gg-10453 Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-gg-10453 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d86882c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d86882c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d86882c3 Branch: refs/heads/ignite-ring-18 Commit: d86882c3597080c62877ba36b916dda29089b900 Parents: 3231f93 6e23608 Author: sboikov Authored: Fri Jun 26 16:55:32 2015 +0300 Committer: sboikov Committed: Fri Jun 26 16:55:32 2015 +0300 ---------------------------------------------------------------------- .../GridCachePartitionExchangeManager.java | 6 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 151 ++++++----- .../ignite/spi/discovery/tcp/ServerImpl.java | 103 +++++-- .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 265 ++++++++++++++++++- 6 files changed, 451 insertions(+), 81 deletions(-) ----------------------------------------------------------------------