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 81D8917434 for ; Fri, 10 Apr 2015 12:44:31 +0000 (UTC) Received: (qmail 54295 invoked by uid 500); 10 Apr 2015 12:44:22 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 54225 invoked by uid 500); 10 Apr 2015 12:44:22 -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 54057 invoked by uid 99); 10 Apr 2015 12:44:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Apr 2015 12:44:21 +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; Fri, 10 Apr 2015 12:44:19 +0000 Received: (qmail 53129 invoked by uid 99); 10 Apr 2015 12:43:59 -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, 10 Apr 2015 12:43:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4A2B0E0418; Fri, 10 Apr 2015 12:43:59 +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, 10 Apr 2015 12:44:17 -0000 Message-Id: <91b2b7686445413f8e436e638ca28c0c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/50] incubator-ignite git commit: Merge branch 'ignite-712' into ignite-sprint-3 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-712' into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9d9d6f35 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9d9d6f35 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9d9d6f35 Branch: refs/heads/ignite-683-2 Commit: 9d9d6f3547d286bff188785cd0c60f0d372be4a4 Parents: bad0161 1003684 Author: Valentin Kulichenko Authored: Fri Apr 10 00:17:28 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Apr 10 00:17:28 2015 -0700 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 3 +- .../processors/cache/GridCacheProcessor.java | 52 ++++++++++---------- .../discovery/tcp/TcpClientDiscoverySpi.java | 6 ++- .../tcp/TcpClientDiscoverySelfTest.java | 6 ++- .../IgniteSpiDiscoverySelfTestSuite.java | 2 + 5 files changed, 40 insertions(+), 29 deletions(-) ----------------------------------------------------------------------