Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-80
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9e32ae00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e32ae00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e32ae00 Branch: refs/heads/ignite-80 Commit: 9e32ae00d73f082c659ab0787438d62b01c6e8a5 Parents: 7a2c52e 86cc1ad Author: sboikov <sboi...@gridgain.com> Authored: Thu Apr 23 09:15:53 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Apr 23 09:15:53 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAffinityManager.java | 12 ------- .../cache/affinity/GridCacheAffinityImpl.java | 2 +- .../preloader/GridDhtPartitionSupplyPool.java | 2 +- .../distributed/near/GridNearAtomicCache.java | 2 +- .../near/GridNearTransactionalCache.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../IgniteCachePutGetRestartAbstractTest.java | 2 +- ...arDisabledFairAffinityPutGetRestartTest.java | 35 ++++++++++++++++++++ .../IgniteCacheFailoverTestSuite.java | 3 +- 9 files changed, 43 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
