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 F23F417383 for ; Wed, 27 May 2015 16:13:35 +0000 (UTC) Received: (qmail 82653 invoked by uid 500); 27 May 2015 16:13:35 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 82624 invoked by uid 500); 27 May 2015 16:13:35 -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 82615 invoked by uid 99); 27 May 2015 16:13:35 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 May 2015 16:13:35 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 7A00BC9218 for ; Wed, 27 May 2015 16:13:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.209 X-Spam-Level: X-Spam-Status: No, score=-3.209 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, 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 (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id rEOdjswI_pBX for ; Wed, 27 May 2015 16:13:23 +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 E994F24CEB for ; Wed, 27 May 2015 16:13:22 +0000 (UTC) Received: (qmail 79503 invoked by uid 99); 27 May 2015 16:13:20 -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; Wed, 27 May 2015 16:13:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6BDA8E0508; Wed, 27 May 2015 16:13:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 27 May 2015 16:13:22 -0000 Message-Id: <562d59938c824e93b501eab54191da93@git.apache.org> In-Reply-To: <522f61f41f694ce0a455e8c937becb2c@git.apache.org> References: <522f61f41f694ce0a455e8c937becb2c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-23' into ignite-23 Merge remote-tracking branch 'origin/ignite-23' into ignite-23 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f3c68557 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f3c68557 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f3c68557 Branch: refs/heads/ignite-943 Commit: f3c68557526ad50b8e56e1761feadc55788daa22 Parents: 1d41396 d12dd41 Author: sboikov Authored: Thu May 21 17:40:13 2015 +0300 Committer: sboikov Committed: Thu May 21 17:40:13 2015 +0300 ---------------------------------------------------------------------- ----------------------------------------------------------------------