Merge branch 'ignite-sprint-4' into ignite-gg-9613

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

Branch: refs/heads/ignite-gg-9702
Commit: ec8d4cc8dcdf82f3e51f64c626e95d5b43eb5d08
Parents: 93da8b4 f91e005
Author: vozerov-gridgain <voze...@gridgain.com>
Authored: Tue Apr 21 15:22:01 2015 +0300
Committer: vozerov-gridgain <voze...@gridgain.com>
Committed: Tue Apr 21 15:22:01 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCacheEvictionManager.java         | 11 +++++-
 .../portable/GridPortableInputStream.java       | 19 -----------
 .../dht/GridCacheDhtPreloadSelfTest.java        |  4 +--
 ...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 ++++++++++++++++++++
 ...nlyFairAffinityMultiNodeFullApiSelfTest.java | 36 ++++++++++++++++++++
 ...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 ++++++++++++++++++++
 ...derFairAffinityMultiNodeFullApiSelfTest.java | 36 ++++++++++++++++++++
 ...nlyFairAffinityMultiNodeFullApiSelfTest.java | 35 +++++++++++++++++++
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |  1 +
 ...nedFairAffinityMultiNodeFullApiSelfTest.java |  3 +-
 .../IgniteCacheFullApiSelfTestSuite.java        | 12 +++++--
 .../IgniteCacheQueryMultiThreadedSelfTest.java  |  1 +
 12 files changed, 204 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


Reply via email to