Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4cccb656 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4cccb656 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4cccb656 Branch: refs/heads/ignite-gg-9702 Commit: 4cccb656718113d6492b6c0d42d58d21e96ba25e Parents: f91e005 dc455be Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Apr 21 17:42:35 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Apr 21 17:42:35 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 10 +- .../dht/GridDhtAffinityAssignmentResponse.java | 21 ++- .../distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 6 +- ...acheSortedEvictionPolicyPerformanceTest.java | 136 +++++++++++++++++++ .../IgniteCacheFullApiSelfTestSuite.java | 15 +- 7 files changed, 173 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
