ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [3/3] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-283-tx' into ignite-283-tx
Date Fri, 20 Feb 2015 11:15:21 GMT
Merge remote-tracking branch 'origin/ignite-283-tx' into ignite-283-tx


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

Branch: refs/heads/ignite-283-tx
Commit: 94079faf1a5d40334be531caa5f3c43744cf3461
Parents: f1ec719 87a55ff
Author: vozerov <vozerov@gridgain.com>
Authored: Fri Feb 20 14:14:59 2015 +0300
Committer: vozerov <vozerov@gridgain.com>
Committed: Fri Feb 20 14:14:59 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheMapEntry.java     | 581 +++++++++++--------
 .../GridDistributedTxRemoteAdapter.java         |  47 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  47 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  84 +--
 .../distributed/near/GridNearAtomicCache.java   |   3 -
 .../cache/transactions/IgniteTxAdapter.java     |  52 +-
 .../cache/transactions/IgniteTxEntry.java       |  12 +-
 .../transactions/IgniteTxLocalAdapter.java      |  32 +-
 .../cache/version/GridCacheVersion.java         |   2 +-
 .../GridCacheVersionConflictContext.java        |  23 +-
 .../cache/version/GridCacheVersionEx.java       |   2 +-
 .../dr/GridDrDataLoadCacheUpdater.java          |   6 +-
 12 files changed, 506 insertions(+), 385 deletions(-)
----------------------------------------------------------------------



Mime
View raw message