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 DDF6117825 for ; Fri, 19 Jun 2015 09:37:28 +0000 (UTC) Received: (qmail 21067 invoked by uid 500); 19 Jun 2015 09:37:28 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 21037 invoked by uid 500); 19 Jun 2015 09:37:28 -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 21028 invoked by uid 99); 19 Jun 2015 09:37:28 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jun 2015 09:37:28 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 6936C1A5D92 for ; Fri, 19 Jun 2015 09:37:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.79 X-Spam-Level: * X-Spam-Status: No, score=1.79 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id bHaLBPvOPq6e for ; Fri, 19 Jun 2015 09:37:13 +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 D6C132AD27 for ; Fri, 19 Jun 2015 09:37:05 +0000 (UTC) Received: (qmail 19216 invoked by uid 99); 19 Jun 2015 09:37:05 -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, 19 Jun 2015 09:37:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A9F79E3CC1; Fri, 19 Jun 2015 09:37:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 19 Jun 2015 09:37:21 -0000 Message-Id: <4976ffe96abe4b09a8b23e246b4b199f@git.apache.org> In-Reply-To: <95fde239d4964a29ac5806b591e10f9b@git.apache.org> References: <95fde239d4964a29ac5806b591e10f9b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1020' into ignite-sprint-6 Merge remote-tracking branch 'remotes/origin/ignite-1020' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af829d0e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af829d0e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af829d0e Branch: refs/heads/ignite-gg-10411 Commit: af829d0ee0a646ac7ed96c65ddda7fc6f38212b0 Parents: 5218210 674072a Author: sboikov Authored: Wed Jun 17 17:19:58 2015 +0300 Committer: sboikov Committed: Wed Jun 17 17:19:58 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 4 + .../processors/cache/IgniteCacheProxy.java | 7 + .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 12 +- .../dr/IgniteDrDataStreamerCacheUpdater.java | 7 +- .../CacheStoreUsageMultinodeAbstractTest.java | 305 +++++++++++++++++++ ...eUsageMultinodeDynamicStartAbstractTest.java | 169 ++++++++++ ...oreUsageMultinodeDynamicStartAtomicTest.java | 32 ++ ...heStoreUsageMultinodeDynamicStartTxTest.java | 32 ++ ...reUsageMultinodeStaticStartAbstractTest.java | 158 ++++++++++ ...toreUsageMultinodeStaticStartAtomicTest.java | 32 ++ ...cheStoreUsageMultinodeStaticStartTxTest.java | 32 ++ .../testsuites/IgniteCacheTestSuite4.java | 4 + 14 files changed, 791 insertions(+), 7 deletions(-) ----------------------------------------------------------------------