Merge branches 'ignite-564' and 'ignite-sprint-3' of 
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-564


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/975b47c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/975b47c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/975b47c4

Branch: refs/heads/ignite-639
Commit: 975b47c4e9b6543649f00e0d1a30b860ffa793f1
Parents: f14e0f2 5a2b46c
Author: Andrey Novikov <anovi...@gridgain.com>
Authored: Tue Apr 7 10:15:57 2015 +0700
Committer: Andrey Novikov <anovi...@gridgain.com>
Committed: Tue Apr 7 10:15:57 2015 +0700

----------------------------------------------------------------------
 .../cache/eviction/fifo/FifoEvictionPolicy.java |  58 ++-
 .../eviction/fifo/FifoEvictionPolicyMBean.java  |  16 +
 .../org/apache/ignite/stream/StreamVisitor.java |   2 +-
 .../eviction/GridCacheEvictionAbstractTest.java |   5 +-
 ...ridCacheFifoBatchEvictionPolicySelfTest.java | 385 +++++++++++++++++++
 pom.xml                                         |  59 ++-
 6 files changed, 508 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


Reply via email to