Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0798504 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0798504 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0798504 Branch: refs/heads/ignite-630 Commit: d0798504652d09b583c7e9436dd619461aea1b05 Parents: b4c424f 7121619 Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Apr 30 16:12:38 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Apr 30 16:12:38 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheTtlManager.java | 168 ++++++++++++------- .../processors/cache/GridCacheUtils.java | 5 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- pom.xml | 51 ++++++ 4 files changed, 166 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0798504/pom.xml ----------------------------------------------------------------------
