Merge branch 'ignite-848' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4accd3ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4accd3ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4accd3ad Branch: refs/heads/ignite-709_2 Commit: 4accd3ad3a268f76507254af2c46f1f89039db9b Parents: 91b2764 70872aa Author: agura <ag...@gridgain.com> Authored: Wed May 6 14:53:06 2015 +0300 Committer: agura <ag...@gridgain.com> Committed: Wed May 6 14:53:06 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMapEntry.java | 18 ++++- .../processors/cache/GridCacheTtlManager.java | 42 ++++------ .../processors/cache/GridCacheUtils.java | 5 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../datastreamer/DataStreamerImpl.java | 2 + .../IgniteCacheExpiryPolicyAbstractTest.java | 2 +- .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../expiry/IgniteCacheTtlCleanupSelfTest.java | 85 ++++++++++++++++++++ 8 files changed, 121 insertions(+), 37 deletions(-) ----------------------------------------------------------------------
