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 1582317D1A for ; Sun, 5 Apr 2015 17:10:45 +0000 (UTC) Received: (qmail 34154 invoked by uid 500); 5 Apr 2015 17:10:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 34125 invoked by uid 500); 5 Apr 2015 17:10:44 -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 34116 invoked by uid 99); 5 Apr 2015 17:10:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Apr 2015 17:10:44 +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; Sun, 05 Apr 2015 17:10:43 +0000 Received: (qmail 28064 invoked by uid 99); 5 Apr 2015 17:06:39 -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; Sun, 05 Apr 2015 17:06:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 38233E190A; Sun, 5 Apr 2015 17:06:39 +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: Sun, 05 Apr 2015 17:06:41 -0000 Message-Id: In-Reply-To: <9219717e16924607976ad80c447a8f01@git.apache.org> References: <9219717e16924607976ad80c447a8f01@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/16] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'origin/ignite-sprint-3' 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/b78dbfff Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b78dbfff Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b78dbfff Branch: refs/heads/ignite-668 Commit: b78dbfff1c61165288ff46b8cf1407f83eba2089 Parents: 82a93c5 d2d6def Author: Artem Shutak Authored: Fri Apr 3 16:32:20 2015 +0300 Committer: Artem Shutak Committed: Fri Apr 3 16:32:20 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +++++++ .../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 6 +++--- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 7 ------- 3 files changed, 10 insertions(+), 10 deletions(-) ----------------------------------------------------------------------