Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-591
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25c349f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25c349f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25c349f4 Branch: refs/heads/ignite-1087 Commit: 25c349f47f70c9824c8d4ba9c4ee679ff597051e Parents: 5dc2d2b 9d0aa6f Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Jul 7 16:01:47 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Jul 7 16:01:47 2015 +0300 ---------------------------------------------------------------------- .../cache/eviction/fifo/FifoEvictionPolicy.java | 5 ----- .../cache/eviction/lru/LruEvictionPolicy.java | 5 ----- .../eviction/sorted/SortedEvictionPolicy.java | 19 +++++-------------- ...cheConcurrentEvictionConsistencySelfTest.java | 15 +++++++++++++-- 4 files changed, 18 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
