Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 29A07200B5C for ; Wed, 6 Jul 2016 10:31:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 283CB160A64; Wed, 6 Jul 2016 08:31:39 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7EA96160A86 for ; Wed, 6 Jul 2016 10:31:38 +0200 (CEST) Received: (qmail 32603 invoked by uid 500); 6 Jul 2016 08:31:37 -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 32380 invoked by uid 99); 6 Jul 2016 08:31:37 -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, 06 Jul 2016 08:31:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 74111E5CE1; Wed, 6 Jul 2016 08:31:37 +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: Wed, 06 Jul 2016 08:31:47 -0000 Message-Id: <970734005dc649f8be0b2091e7235446@git.apache.org> In-Reply-To: <24b7f4bb48d34a6c8f9f46b8531d64d0@git.apache.org> References: <24b7f4bb48d34a6c8f9f46b8531d64d0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/11] ignite git commit: Merge remote-tracking branch 'remotes/community/gridgain-7.6.2' archived-at: Wed, 06 Jul 2016 08:31:39 -0000 Merge remote-tracking branch 'remotes/community/gridgain-7.6.2' # 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/GridCacheTxRecoveryResponse.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00e966ae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00e966ae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00e966ae Branch: refs/heads/master Commit: 00e966ae7dedbb65420c8289c9f76db7bebf1a60 Parents: 6611d0c Author: sboikov Authored: Wed Jul 6 11:31:14 2016 +0300 Committer: sboikov Committed: Wed Jul 6 11:31:14 2016 +0300 ---------------------------------------------------------------------- .../cache/distributed/GridCacheTxRecoveryRequest.java | 1 - .../cache/distributed/GridCacheTxRecoveryResponse.java | 5 ++--- .../cache/distributed/GridDistributedTxFinishResponse.java | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/00e966ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java index 6fdb30b..76f39b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.distributed; import java.io.Externalizable; import java.nio.ByteBuffer; - import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; http://git-wip-us.apache.org/repos/asf/ignite/blob/00e966ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java index dae19a3..c087a3d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java @@ -19,12 +19,11 @@ package org.apache.ignite.internal.processors.cache.distributed; import java.io.Externalizable; import java.nio.ByteBuffer; +import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.GridDirectTransient; +import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxState; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxStateAware; - -import org.apache.ignite.IgniteLogger; -import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; http://git-wip-us.apache.org/repos/asf/ignite/blob/00e966ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java index c08c5b2..109d665 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.distributed; import java.io.Externalizable; import java.nio.ByteBuffer; - import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.processors.cache.GridCacheMessage; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;