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 2017/01/09 09:51:52 UTC

[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-3477' into ignite-3477

Merge remote-tracking branch 'origin/ignite-3477' into ignite-3477


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

Branch: refs/heads/ignite-3477
Commit: a74d5ee23ed7ec0d0421f490f2baa42f13d584ec
Parents: 48b2653 06de699
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jan 9 12:51:58 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jan 9 12:51:58 2017 +0300

----------------------------------------------------------------------
 .../cache/CacheOffheapEvictionManager.java      | 90 ++++++++++++++++++++
 .../cache/CacheOfheapEvictionManager.java       | 90 --------------------
 .../processors/cache/GridCacheProcessor.java    |  4 +-
 .../processors/cache/GridCacheTtlManager.java   |  1 +
 .../cache/IgniteCacheOffheapManagerImpl.java    | 16 ++--
 .../cache/GridCacheAbstractTxReadTest.java      |  2 -
 .../cache/GridCacheBasicStoreAbstractTest.java  |  2 +-
 ...cheLocalBasicStoreMultithreadedSelfTest.java |  1 +
 8 files changed, 106 insertions(+), 100 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a74d5ee2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
----------------------------------------------------------------------