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 411B917C39 for ; Fri, 17 Jul 2015 10:25:05 +0000 (UTC) Received: (qmail 51834 invoked by uid 500); 17 Jul 2015 10:25:05 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 51804 invoked by uid 500); 17 Jul 2015 10:25:05 -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 51793 invoked by uid 99); 17 Jul 2015 10:25:05 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jul 2015 10:25:05 +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 B154B1858C5 for ; Fri, 17 Jul 2015 10:25:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, 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 YtFqMnHSXCmB for ; Fri, 17 Jul 2015 10:24:58 +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 D033D20EFB for ; Fri, 17 Jul 2015 10:24:57 +0000 (UTC) Received: (qmail 51631 invoked by uid 99); 17 Jul 2015 10:24:57 -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, 17 Jul 2015 10:24:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 84FC4E33CA; Fri, 17 Jul 2015 10:24:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ivasilinets@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 17 Jul 2015 10:24:59 -0000 Message-Id: <926b7ac67591459ca162a2650b2538c5@git.apache.org> In-Reply-To: <14cbaf04fb07401faff32fd42ab76602@git.apache.org> References: <14cbaf04fb07401faff32fd42ab76602@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-ignite git commit: Merge branch 'ignite-961' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-961 Merge branch 'ignite-961' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-961 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e134cd97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e134cd97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e134cd97 Branch: refs/heads/ignite-961 Commit: e134cd97984424e86aed587a7106519499da44e7 Parents: 8a8b32a c7e7c46 Author: ivasilinets Authored: Fri Jul 17 13:22:06 2015 +0300 Committer: ivasilinets Committed: Fri Jul 17 13:22:06 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 12 ++ .../processors/cache/GridCacheContext.java | 45 +++-- .../processors/cache/GridCacheMvccManager.java | 6 +- .../GridCachePartitionExchangeManager.java | 53 ++++++ .../distributed/dht/GridDhtTopologyFuture.java | 14 -- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 11 +- .../GridDhtPartitionsExchangeFuture.java | 31 +--- .../cache/transactions/IgniteTxManager.java | 4 +- .../distributed/IgniteCache150ClientsTest.java | 1 + .../IgniteCacheClientReconnectTest.java | 175 +++++++++++++++++++ .../IgniteCacheServerNodeConcurrentStart.java | 96 ++++++++++ .../testframework/junits/GridAbstractTest.java | 5 + .../testsuites/IgniteCacheTestSuite2.java | 2 +- .../testsuites/IgniteCacheTestSuite4.java | 2 - .../testsuites/IgniteClientNodesTestSuite.java | 42 +++++ 16 files changed, 439 insertions(+), 64 deletions(-) ----------------------------------------------------------------------