ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [08/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-96' into ignite-96-tests
Date Thu, 12 Feb 2015 09:44:33 GMT
Merge branch 'ignite-96' into ignite-96-tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b182b2ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b182b2ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b182b2ea

Branch: refs/heads/sprint-1
Commit: b182b2ea6cac3710cf700d3d5dc8345cf7e5d351
Parents: 428edde 7757c44
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Tue Feb 10 16:43:41 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Tue Feb 10 16:43:41 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheContext.java      |   4 +-
 .../processors/cache/GridCacheMapEntry.java     |   2 +-
 .../cache/GridCacheUpdateAtomicResult.java      |   6 +-
 .../GridDistributedTxRemoteAdapter.java         |   4 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   4 +-
 .../cache/transactions/IgniteTxAdapter.java     |   6 +-
 .../transactions/IgniteTxLocalAdapter.java      |   4 +-
 ...ridCacheVersionAbstractConflictResolver.java |   6 +-
 .../GridCacheVersionConflictContext.java        | 163 +++++++++++++++-
 .../GridCacheVersionConflictContextImpl.java    | 187 -------------------
 .../GridCacheVersionConflictResolver.java       |   2 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  28 ++-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |  10 +
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 182 ++++++++++++++++++
 14 files changed, 392 insertions(+), 216 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b182b2ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------


Mime
View raw message