Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-4-tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5b0b6c5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5b0b6c5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5b0b6c5d Branch: refs/heads/ignite-sprint-4-tests Commit: 5b0b6c5d183cd9498c5767c9fdd0c4dd810b3199 Parents: 53d49f1 bc025d9 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Apr 21 11:48:37 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Apr 21 11:48:37 2015 +0300 ---------------------------------------------------------------------- .../cache/eviction/fifo/FifoEvictionPolicy.java | 7 +- .../igfs/IgfsPerBlockLruEvictionPolicy.java | 3 +- .../cache/eviction/lru/LruEvictionPolicy.java | 5 +- .../eviction/sorted/SortedEvictionPolicy.java | 431 +++++++++++++++++++ .../sorted/SortedEvictionPolicyMBean.java | 66 +++ .../cache/eviction/sorted/package-info.java | 21 + .../discovery/GridDiscoveryManager.java | 2 +- .../IgniteCachePutGetRestartAbstractTest.java | 219 ++++++++++ ...iteCacheTxNearDisabledPutGetRestartTest.java | 30 ++ ...dCacheSortedBatchEvictionPolicySelfTest.java | 385 +++++++++++++++++ .../GridCacheSortedEvictionPolicySelfTest.java | 373 ++++++++++++++++ .../IgniteCacheEvictionSelfTestSuite.java | 3 + .../IgniteCacheFailoverTestSuite.java | 2 + 13 files changed, 1538 insertions(+), 9 deletions(-) ----------------------------------------------------------------------