You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/02 16:12:30 UTC
[08/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/sprint-2' into ignite-136
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-136
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8d0f1b8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8d0f1b8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8d0f1b8b
Branch: refs/heads/ignite-334
Commit: 8d0f1b8b388044374882cbf2baba2bbcd6854bc2
Parents: 23338a4 dd51ef5
Author: sboikov <sb...@gridgain.com>
Authored: Wed Feb 25 09:15:19 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Feb 25 09:15:19 2015 +0300
----------------------------------------------------------------------
.../ignite/codegen/MessageCodeGenerator.java | 28 +-
.../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 | 48 +-
.../cache/version/GridCacheVersion.java | 3 +-
.../GridCacheVersionConflictContext.java | 35 +-
.../cache/version/GridCacheVersionEx.java | 2 +-
.../dr/GridDrDataLoadCacheUpdater.java | 6 +-
.../core/src/main/resources/ignite.properties | 2 +-
.../near/IgniteCacheNearReadCommittedTest.java | 3 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 3 +-
.../client/hadoop/GridHadoopClientProtocol.java | 3 +-
.../hadoop/GridHadoopDefaultJobInfo.java | 5 +-
18 files changed, 535 insertions(+), 432 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d0f1b8b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d0f1b8b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------