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 7F22A18C63 for ; Wed, 27 May 2015 14:48:58 +0000 (UTC) Received: (qmail 28400 invoked by uid 500); 27 May 2015 14:48:58 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 28367 invoked by uid 500); 27 May 2015 14:48:58 -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 28348 invoked by uid 99); 27 May 2015 14:48:58 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 May 2015 14:48:58 +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 F3A27C91CE for ; Wed, 27 May 2015 14:48:57 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.229 X-Spam-Level: X-Spam-Status: No, score=-3.229 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, 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 (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id BaV7uhDLiT2d for ; Wed, 27 May 2015 14:48:53 +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 CF4CA2309F for ; Wed, 27 May 2015 14:48:52 +0000 (UTC) Received: (qmail 28215 invoked by uid 99); 27 May 2015 14:48:52 -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; Wed, 27 May 2015 14:48:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9C322E0505; Wed, 27 May 2015 14:48:52 +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: Wed, 27 May 2015 14:48:57 -0000 Message-Id: <8ee8a105e6a046149cabdbb1e0ed2d8e@git.apache.org> In-Reply-To: <3ac38a18bf544ad4a15c002373f69d3e@git.apache.org> References: <3ac38a18bf544ad4a15c002373f69d3e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/38] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-23 Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-23 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fcf02fef Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fcf02fef Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fcf02fef Branch: refs/heads/ignite-709_2 Commit: fcf02fef4daf124b1283f0d9c111d1c0bda6deec Parents: 632a01a ecf34ca Author: sboikov Authored: Tue May 19 22:15:20 2015 +0300 Committer: sboikov Committed: Tue May 19 22:15:20 2015 +0300 ---------------------------------------------------------------------- .../discovery/tcp/TcpClientDiscoverySpi.java | 17 ++- .../spi/discovery/tcp/TcpDiscoverySpi.java | 23 ++-- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 11 +- .../internal/GridReleaseTypeSelfTest.java | 92 +++++++++----- .../GridDiscoveryManagerAliveCacheSelfTest.java | 12 +- .../GridDiscoveryManagerAttributesSelfTest.java | 121 +++++++++++-------- .../discovery/GridDiscoveryManagerSelfTest.java | 44 +++++-- .../IgniteClientDataStructuresAbstractTest.java | 19 +-- ...ientModesTcpClientDiscoveryAbstractTest.java | 21 +--- ...pClientDiscoveryMarshallerCheckSelfTest.java | 18 +-- .../tcp/TcpClientDiscoverySpiSelfTest.java | 2 - .../tcp/TcpDiscoveryConcurrentStartTest.java | 20 +-- .../testframework/junits/GridAbstractTest.java | 6 +- .../junits/common/GridCommonAbstractTest.java | 31 +++++ .../testsuites/IgniteKernalSelfTestSuite.java | 6 +- 15 files changed, 251 insertions(+), 192 deletions(-) ----------------------------------------------------------------------