ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [19/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-306' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-306
Date Thu, 26 Feb 2015 14:02:58 GMT
Merge branches 'ignite-306' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-306


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

Branch: refs/heads/ignite-11
Commit: 1809af1da4486dd1444f011e37e2eb43810205ba
Parents: b0c8d7a 45ce814
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Tue Feb 24 17:59:41 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Tue Feb 24 17:59:41 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheMapEntry.java     | 562 +++++++++++--------
 .../GridDistributedTxRemoteAdapter.java         |  66 +--
 .../dht/atomic/GridDhtAtomicCache.java          |  44 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  84 +--
 .../distributed/near/GridNearAtomicCache.java   |   3 -
 .../cache/transactions/IgniteTxAdapter.java     |  58 +-
 .../cache/transactions/IgniteTxEntry.java       |  12 +-
 .../transactions/IgniteTxLocalAdapter.java      |  40 +-
 .../cache/version/GridCacheVersion.java         |   3 +-
 .../GridCacheVersionConflictContext.java        |  35 +-
 .../cache/version/GridCacheVersionEx.java       |   2 +-
 .../dr/GridDrDataLoadCacheUpdater.java          |   6 +-
 .../core/src/main/resources/ignite.properties   |   2 +-
 13 files changed, 501 insertions(+), 416 deletions(-)
----------------------------------------------------------------------



Mime
View raw message