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 864EA1801B for ; Fri, 3 Jul 2015 12:15:41 +0000 (UTC) Received: (qmail 49514 invoked by uid 500); 3 Jul 2015 12:15:41 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 49484 invoked by uid 500); 3 Jul 2015 12:15:41 -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 49475 invoked by uid 99); 3 Jul 2015 12:15:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jul 2015 12:15:41 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,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, 03 Jul 2015 12:13:32 +0000 Received: (qmail 46752 invoked by uid 99); 3 Jul 2015 12:15:18 -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, 03 Jul 2015 12:15:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3837EE17FC; Fri, 3 Jul 2015 12:15:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 03 Jul 2015 12:15:19 -0000 Message-Id: <025891f7500049c1bfbc98d3ef45926a@git.apache.org> In-Reply-To: <145315b210404f4190189eb758fcbd1d@git.apache.org> References: <145315b210404f4190189eb758fcbd1d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-901' into ignite-901 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'origin/ignite-901' into ignite-901 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bf97d042 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bf97d042 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bf97d042 Branch: refs/heads/ignite-901 Commit: bf97d042a669921f19c80dee0ef0d2009e4789e6 Parents: 3508bce c4abdf4 Author: nikolay_tikhonov Authored: Fri Jul 3 15:15:32 2015 +0300 Committer: nikolay_tikhonov Committed: Fri Jul 3 15:15:32 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheGateway.java | 4 +- .../GridCachePartitionExchangeManager.java | 72 ++++++++++---------- .../datastructures/DataStructuresProcessor.java | 12 ++++ .../ignite/spi/discovery/tcp/ClientImpl.java | 4 +- .../IgniteClientReconnectAbstractTest.java | 2 +- .../IgniteClientReconnectAtomicsTest.java | 8 +-- .../IgniteClientReconnectCacheTest.java | 13 ++++ ...IgniteClientReconnectDiscoveryStateTest.java | 4 +- 8 files changed, 73 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf97d042/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java ----------------------------------------------------------------------