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 5DF6018C13 for ; Tue, 19 May 2015 15:00:44 +0000 (UTC) Received: (qmail 37731 invoked by uid 500); 19 May 2015 15:00:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 37701 invoked by uid 500); 19 May 2015 15:00: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 37692 invoked by uid 99); 19 May 2015 15:00:44 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 May 2015 15:00:44 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id D99AA182929 for ; Tue, 19 May 2015 15:00:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.771 X-Spam-Level: X-Spam-Status: No, score=0.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, 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 (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id EJe9rk2aDb3w for ; Tue, 19 May 2015 15:00:38 +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 3B06824E99 for ; Tue, 19 May 2015 15:00:38 +0000 (UTC) Received: (qmail 37606 invoked by uid 99); 19 May 2015 15:00:38 -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; Tue, 19 May 2015 15:00:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 06199E30F6; Tue, 19 May 2015 15:00:38 +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: Tue, 19 May 2015 15:00:42 -0000 Message-Id: <784fb245f9d848439b78e6ae1705c5d1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/8] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-23 Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-23 Conflicts: modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6f5f15c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6f5f15c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6f5f15c Branch: refs/heads/ignite-23 Commit: d6f5f15c6f73dd0a643c9ef98a42f5db4b36771b Parents: a2a6f31 ba7fddb Author: sboikov Authored: Tue May 19 09:06:02 2015 +0300 Committer: sboikov Committed: Tue May 19 09:06:02 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/managers/communication/GridIoManager.java | 6 +++--- .../communication/GridLifecycleAwareMessageFilter.java | 5 ++++- .../org/apache/ignite/testsuites/IgniteCacheTestSuite2.java | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6f5f15c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java ----------------------------------------------------------------------