ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [18/20] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-238' into sprint-1
Date Fri, 13 Feb 2015 12:30:38 GMT
Merge remote-tracking branch 'remotes/origin/ignite-238' into sprint-1


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

Branch: refs/heads/ignite-236
Commit: c98696d3db950d120b8cf9ce41c2d41624996ac4
Parents: 1651ccc 4ba47ae
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Feb 13 14:53:52 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Feb 13 14:53:52 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/cache/CacheProjection.java    |   4 +-
 .../processors/cache/GridCacheAdapter.java      |  66 ++++--
 .../processors/cache/GridCacheEntryEx.java      |   7 +-
 .../processors/cache/GridCacheMapEntry.java     |  36 +++-
 .../cache/GridCacheProjectionImpl.java          |   8 +-
 .../processors/cache/GridCacheProxyImpl.java    |   8 +-
 .../cache/IgniteCacheExpiryPolicy.java          |   6 +
 .../processors/cache/IgniteCacheProxy.java      |   2 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  27 ++-
 .../dht/atomic/GridDhtAtomicCache.java          |  96 +--------
 .../dht/colocated/GridDhtColocatedCache.java    |   4 +-
 .../distributed/near/GridNearCacheAdapter.java  |   2 +-
 .../cache/distributed/near/GridNearTxLocal.java |  19 +-
 .../local/atomic/GridLocalAtomicCache.java      |   7 +-
 .../cache/query/GridCacheQueryManager.java      | 109 ++++++++--
 .../processors/cache/GridCacheTestEntryEx.java  |   8 +-
 .../cache/GridCacheVersionMultinodeTest.java    | 208 +++++++++++++++++++
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  20 ++
 .../ignite/testsuites/IgniteCacheTestSuite.java |   1 +
 19 files changed, 446 insertions(+), 192 deletions(-)
----------------------------------------------------------------------



Mime
View raw message