ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [22/44] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Date Thu, 26 Feb 2015 09:29:23 GMT
Merge remote-tracking branch 'origin/sprint-2' into sprint-2


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

Branch: refs/heads/ignite-217
Commit: f9cfec9947858d30b2ef3c18195593720cabf169
Parents: 08d17da d6793f2
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Tue Feb 24 20:53:10 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Tue Feb 24 20:53:10 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 +-
 .../client/hadoop/GridHadoopClientProtocol.java |   3 +-
 .../hadoop/GridHadoopDefaultJobInfo.java        |   5 +-
 15 files changed, 506 insertions(+), 419 deletions(-)
----------------------------------------------------------------------



Mime
View raw message