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 BECEF17C08 for ; Thu, 16 Apr 2015 09:49:49 +0000 (UTC) Received: (qmail 78348 invoked by uid 500); 16 Apr 2015 09:49:49 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 78321 invoked by uid 500); 16 Apr 2015 09:49:49 -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 78312 invoked by uid 99); 16 Apr 2015 09:49:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Apr 2015 09:49:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_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; Thu, 16 Apr 2015 09:49:27 +0000 Received: (qmail 77406 invoked by uid 99); 16 Apr 2015 09:49:20 -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 Apr 2015 09:49:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 74203E1085; Thu, 16 Apr 2015 09:49:20 +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: Thu, 16 Apr 2015 09:49:48 -0000 Message-Id: In-Reply-To: <2440f1a964f44b49b5d81368506d6ec4@git.apache.org> References: <2440f1a964f44b49b5d81368506d6ec4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3-p1' into ignite-sprint-3-p1 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'origin/ignite-sprint-3-p1' into ignite-sprint-3-p1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6a115cb0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6a115cb0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6a115cb0 Branch: refs/heads/ignite-424 Commit: 6a115cb0974543d2982712c67b8f7fe2de84e6a7 Parents: 54a2a5f f4afde9 Author: Artem Shutak Authored: Wed Apr 15 11:38:47 2015 +0300 Committer: Artem Shutak Committed: Wed Apr 15 11:38:47 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 6 - .../internal/managers/GridManagerAdapter.java | 4 + .../discovery/GridDiscoveryManager.java | 14 +++ .../org/apache/ignite/spi/IgniteSpiAdapter.java | 5 + .../org/apache/ignite/spi/IgniteSpiContext.java | 6 + .../communication/tcp/TcpCommunicationSpi.java | 70 ++++++------ .../tcp/TcpCommunicationSpiMBean.java | 9 -- .../ignite/spi/discovery/DiscoverySpi.java | 7 ++ .../discovery/tcp/TcpClientDiscoverySpi.java | 12 ++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 32 +++++- ...ridFailFastNodeFailureDetectionSelfTest.java | 112 +++++++++++++++++++ .../testframework/GridSpiTestContext.java | 5 + .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../processors/query/h2/IgniteH2Indexing.java | 3 +- 14 files changed, 233 insertions(+), 53 deletions(-) ----------------------------------------------------------------------