Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-646
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/03c54d89 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/03c54d89 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/03c54d89 Branch: refs/heads/ignite-286 Commit: 03c54d8907a4d77262e659dcae35ac509ad9c480 Parents: a47974c 6304fab Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Apr 21 16:33:42 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Apr 21 16:33:42 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheEvictionManager.java | 11 +++++- .../dht/GridDhtAffinityAssignmentResponse.java | 21 +++++++++++- .../distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 6 ++-- .../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 | 11 ++++-- .../IgniteCacheQueryMultiThreadedSelfTest.java | 1 + 15 files changed, 228 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
