ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [24/46] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-gg-9809
Date Wed, 25 Feb 2015 00:36:47 GMT
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-gg-9809


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

Branch: refs/heads/ignite-sql-tests
Commit: a7cf457f22750601e58e44840a1470235f8ee5d0
Parents: 6c04c0f 510fd17
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Wed Feb 18 17:54:25 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Wed Feb 18 17:54:25 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      |  36 +++-
 .../processors/cache/GridCacheContext.java      |  14 +-
 .../processors/cache/GridCacheEntryEx.java      |  16 +-
 .../processors/cache/GridCacheMapEntry.java     |  52 +++---
 .../cache/GridCacheUpdateAtomicResult.java      |  29 ++--
 .../processors/cache/GridCacheUtils.java        |   2 +-
 .../GridDistributedTxRemoteAdapter.java         |  21 ++-
 .../distributed/dht/GridDhtCacheAdapter.java    |   9 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |   5 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  13 +-
 .../dht/atomic/GridDhtAtomicCache.java          | 126 +++++++-------
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |  12 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  | 100 +++++------
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   4 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java | 128 +++++++-------
 .../distributed/near/GridNearAtomicCache.java   |   2 +-
 .../near/GridNearTxPrepareFuture.java           |   5 +-
 .../processors/cache/dr/GridCacheDrInfo.java    |   5 +-
 .../cache/transactions/IgniteTxAdapter.java     |   5 +-
 .../cache/transactions/IgniteTxEntry.java       |  63 +++----
 .../transactions/IgniteTxLocalAdapter.java      |  65 +++-----
 .../dataload/IgniteDataLoaderImpl.java          |   3 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   2 +-
 .../IgniteCacheExpiryStoreLoadSelfTest.java     | 166 +++++++++++++++++++
 .../cache/GridCacheQueryIndexSelfTest.java      |   4 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   8 +-
 .../IgniteCacheExpiryPolicyTestSuite.java       |   3 +
 .../cache/GridCacheQueryLoadSelfTest.java       |  30 ++--
 28 files changed, 547 insertions(+), 381 deletions(-)
----------------------------------------------------------------------



Mime
View raw message