Merge branch 'ignite-728' 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/d8ced90e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d8ced90e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d8ced90e Branch: refs/heads/ignite-157-2 Commit: d8ced90e512a71e8131329bdc37a936e88f55c3a Parents: 2a176e4 65780ec5 Author: agura <ag...@gridgain.com> Authored: Thu Apr 30 15:40:30 2015 +0300 Committer: agura <ag...@gridgain.com> Committed: Thu Apr 30 15:40:30 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheTtlManager.java | 168 ++++++++++++------- .../processors/cache/GridCacheUtils.java | 5 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- 3 files changed, 115 insertions(+), 62 deletions(-) ----------------------------------------------------------------------
