ignite-commits mailing list archives

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


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

Branch: refs/heads/ignite-22
Commit: 7e0c9cae2c689247cd68f78a1fdd761c736d56f5
Parents: 831f4ef 510fd17
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Wed Feb 18 17:54:45 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Wed Feb 18 17:54:45 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      |  36 +++-
 .../processors/cache/GridCacheContext.java      |  10 ++
 .../GridDistributedTxRemoteAdapter.java         |   6 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   9 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |   1 +
 .../distributed/dht/GridDhtTxPrepareFuture.java |  13 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  44 +++--
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  | 100 +++++------
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   4 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java | 128 +++++++-------
 .../near/GridNearTxPrepareFuture.java           |   5 +-
 .../cache/transactions/IgniteTxAdapter.java     |   5 +-
 .../cache/transactions/IgniteTxEntry.java       |  17 +-
 .../transactions/IgniteTxLocalAdapter.java      |  45 ++---
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   2 +-
 .../IgniteCacheExpiryStoreLoadSelfTest.java     | 166 +++++++++++++++++++
 .../cache/GridCacheQueryIndexSelfTest.java      |   4 +-
 .../IgniteCacheExpiryPolicyTestSuite.java       |   3 +
 .../cache/GridCacheQueryLoadSelfTest.java       |  30 ++--
 19 files changed, 394 insertions(+), 234 deletions(-)
----------------------------------------------------------------------



Mime
View raw message