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 24095181AC for ; Mon, 5 Oct 2015 15:59:50 +0000 (UTC) Received: (qmail 66900 invoked by uid 500); 5 Oct 2015 15:59:50 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 66821 invoked by uid 500); 5 Oct 2015 15:59:50 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 65828 invoked by uid 99); 5 Oct 2015 15:59:49 -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; Mon, 05 Oct 2015 15:59:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 66D6FE04BE; Mon, 5 Oct 2015 15:59:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 05 Oct 2015 16:00:18 -0000 Message-Id: <54ff9c55558c469f9518b58fc14a6a67@git.apache.org> In-Reply-To: <84a8ebd3d1ce4e8f8355033d7b51ed21@git.apache.org> References: <84a8ebd3d1ce4e8f8355033d7b51ed21@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/50] ignite git commit: Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de39fbf2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de39fbf2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de39fbf2 Branch: refs/heads/ignite-1093-2 Commit: de39fbf269ad6f834ab01444558ea2dced1c2035 Parents: f380883 1282f8b Author: Dmitiry Setrakyan Authored: Wed Sep 30 14:19:28 2015 +0200 Committer: Dmitiry Setrakyan Committed: Wed Sep 30 14:19:28 2015 +0200 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 22 +-- .../processors/cache/GridCacheEventManager.java | 12 +- .../processors/cache/GridCacheIoManager.java | 76 +-------- .../processors/cache/GridCacheMessage.java | 7 - .../processors/cache/GridCacheProcessor.java | 68 +++++--- .../cache/GridCacheSharedContext.java | 32 ---- .../processors/cache/GridCacheUtils.java | 8 - .../dht/GridDhtAffinityAssignmentRequest.java | 5 - .../dht/GridDhtAffinityAssignmentResponse.java | 5 - .../distributed/dht/GridDhtLockRequest.java | 5 - .../distributed/dht/GridDhtTxFinishRequest.java | 5 - .../dht/GridDhtTxPrepareRequest.java | 7 +- .../dht/preloader/GridDhtForceKeysRequest.java | 5 - .../dht/preloader/GridDhtForceKeysResponse.java | 5 - .../GridDhtPartitionDemandMessage.java | 5 - .../GridDhtPartitionSupplyMessage.java | 5 - .../GridDhtPartitionsAbstractMessage.java | 5 - .../dht/preloader/GridDhtPreloader.java | 6 + .../IgniteClientReconnectAbstractTest.java | 35 ++++- .../IgniteClientReconnectCacheTest.java | 154 +++++++++++++++++++ .../IgniteCacheP2pUnmarshallingErrorTest.java | 7 + ...CacheP2pUnmarshallingRebalanceErrorTest.java | 12 +- 22 files changed, 266 insertions(+), 225 deletions(-) ----------------------------------------------------------------------