You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/05/27 18:13:22 UTC
[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 <sb...@gridgain.com>
Authored: Thu May 21 17:40:13 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu May 21 17:40:13 2015 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------