Merge remote-tracking branch 'origin/sprint-2' 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/46386e55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46386e55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46386e55

Branch: refs/heads/ignite-283
Commit: 46386e55223174fbd4b08c5b80c44724913287f1
Parents: 3c4a85d 2ef337c
Author: vozerov <voze...@gridgain.com>
Authored: Wed Feb 18 16:59:32 2015 +0300
Committer: vozerov <voze...@gridgain.com>
Committed: Wed Feb 18 16:59:32 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      |  33 +++-
 .../distributed/dht/GridDhtCacheAdapter.java    |   6 +-
 .../IgniteCacheExpiryStoreLoadSelfTest.java     | 166 +++++++++++++++++++
 .../IgniteCacheExpiryPolicyTestSuite.java       |   3 +
 4 files changed, 204 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46386e55/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

Reply via email to