Merge remote-tracking branch 'remotes/origin/ignite-519' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dfcfc0e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dfcfc0e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dfcfc0e4 Branch: refs/heads/ignite-443 Commit: dfcfc0e4bd575b7b253a159442529a8e6aa5f873 Parents: 16a4265 46c9d81 Author: sboikov <sboi...@gridgain.com> Authored: Fri Mar 20 13:29:52 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Mar 20 13:29:52 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 23 ++++++- .../IgniteCacheExpiryPolicyAbstractTest.java | 64 +++++++++++++++----- 3 files changed, 72 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
