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 012DB189C0 for ; Thu, 23 Jul 2015 14:06:30 +0000 (UTC) Received: (qmail 67015 invoked by uid 500); 23 Jul 2015 14:05:55 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 66982 invoked by uid 500); 23 Jul 2015 14:05:55 -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 66973 invoked by uid 99); 23 Jul 2015 14:05:55 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jul 2015 14:05:55 +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 3FB0F1A7753 for ; Thu, 23 Jul 2015 14:05:55 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.791 X-Spam-Level: X-Spam-Status: No, score=0.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, 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 (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id UaOj2-kQxdmf for ; Thu, 23 Jul 2015 14:05:43 +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 EE9F12DC2B for ; Thu, 23 Jul 2015 14:05:29 +0000 (UTC) Received: (qmail 63755 invoked by uid 99); 23 Jul 2015 14:05:29 -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; Thu, 23 Jul 2015 14:05:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BD2BAE6829; Thu, 23 Jul 2015 14:05:29 +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: Thu, 23 Jul 2015 14:06:11 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [43/50] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a57707f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a57707f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a57707f6 Branch: refs/heads/ignite-1108 Commit: a57707f6ef387ea6f48fd878747e8c5044e7758e Parents: 0b25ec2 c044bb8 Author: Denis Magda Authored: Wed Jul 22 15:49:04 2015 +0300 Committer: Denis Magda Committed: Wed Jul 22 15:49:04 2015 +0300 ---------------------------------------------------------------------- modules/apache-license-gen/pom.xml | 13 -------- .../processors/cache/GridCacheMvccManager.java | 14 +++++++++ .../distributed/dht/GridDhtTxFinishFuture.java | 13 +++++++- .../GridDhtPartitionsExchangeFuture.java | 10 +++++-- .../near/GridNearOptimisticTxPrepareFuture.java | 4 ++- .../GridNearPessimisticTxPrepareFuture.java | 2 +- .../near/GridNearTxFinishFuture.java | 17 ++++++++++- .../cache/transactions/IgniteTxManager.java | 5 ++-- .../cache/GridCachePutAllFailoverSelfTest.java | 3 ++ .../GridCacheAbstractNodeRestartSelfTest.java | 9 ++++++ ...NearDisabledOptimisticTxNodeRestartTest.java | 31 ++++++++++++++++++++ .../GridCachePartitionedFailoverSelfTest.java | 5 ---- ...ePartitionedOptimisticTxNodeRestartTest.java | 12 +++++++- .../IgniteCacheFailoverTestSuite2.java | 4 +++ .../testsuites/IgniteCacheRestartTestSuite.java | 5 ++-- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 ++++ .../org/apache/ignite/spark/IgniteContext.scala | 14 +++++++++ 17 files changed, 135 insertions(+), 31 deletions(-) ----------------------------------------------------------------------