ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [3/3] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-23' into ignite-23
Date Thu, 21 May 2015 14:40:42 GMT
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-23
Commit: f3c68557526ad50b8e56e1761feadc55788daa22
Parents: 1d41396 d12dd41
Author: sboikov <sboikov@gridgain.com>
Authored: Thu May 21 17:40:13 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu May 21 17:40:13 2015 +0300

----------------------------------------------------------------------

----------------------------------------------------------------------



Mime
View raw message