ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [46/46] incubator-ignite git commit: Merge branch 'ignite-sprint-4' into ignite-gg-9702
Date Fri, 24 Apr 2015 06:25:14 GMT
Merge branch 'ignite-sprint-4' into ignite-gg-9702


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

Branch: refs/heads/ignite-gg-9702
Commit: 8cee0ff277b5438d06c0356bbf77dd53e61c1064
Parents: db24996 0a28058
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Apr 24 09:23:51 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Apr 24 09:23:51 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      |   9 +-
 .../processors/cache/GridCacheEntryEx.java      |   4 +
 .../processors/cache/GridCacheMapEntry.java     |  20 +-
 .../processors/cache/GridCacheUtils.java        |   6 +-
 .../GridDistributedCacheAdapter.java            |  20 +-
 .../distributed/GridDistributedLockRequest.java |  99 +++-
 .../distributed/dht/GridDhtCacheAdapter.java    |   4 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |   9 +-
 .../distributed/dht/GridDhtLockFuture.java      |  20 +-
 .../distributed/dht/GridDhtLockRequest.java     |   7 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  21 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  26 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   6 +-
 .../cache/distributed/dht/GridDhtTxRemote.java  |   7 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  41 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  14 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |  49 +-
 .../dht/colocated/GridDhtColocatedCache.java    |  36 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  14 +-
 .../distributed/near/GridNearAtomicCache.java   |   5 +-
 .../distributed/near/GridNearCacheAdapter.java  |  10 +-
 .../distributed/near/GridNearCacheEntry.java    |   3 +-
 .../distributed/near/GridNearLockFuture.java    |  11 +-
 .../distributed/near/GridNearLockRequest.java   |   7 +-
 .../near/GridNearTransactionalCache.java        |  25 +-
 .../cache/distributed/near/GridNearTxLocal.java |   7 +-
 .../distributed/near/GridNearTxRemote.java      |   7 +-
 .../local/atomic/GridLocalAtomicCache.java      |  59 ++-
 .../cache/transactions/IgniteTxEntry.java       |  74 ++-
 .../transactions/IgniteTxLocalAdapter.java      |  94 ++--
 .../cache/transactions/IgniteTxLocalEx.java     |   4 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java | 514 ++++++++++++++++++-
 .../processors/cache/GridCacheTestEntryEx.java  |   2 +
 33 files changed, 1032 insertions(+), 202 deletions(-)
----------------------------------------------------------------------



Mime
View raw message