Merge remote-tracking branch 'origin/ignite-sprint-4' 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/71216191 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71216191 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71216191 Branch: refs/heads/ignite-157-2 Commit: 71216191625c6d3f577c2e6e27bcb2c8f81d9a6b Parents: 53996a1 d8ced90 Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Apr 30 15:55:15 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Apr 30 15:55:15 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheTtlManager.java | 168 ++++++++++++------- .../processors/cache/GridCacheUtils.java | 5 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- 3 files changed, 115 insertions(+), 62 deletions(-) ----------------------------------------------------------------------
