Merge remote-tracking branch 'remotes/origin/ignite-787' 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/86cc1ade Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/86cc1ade Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/86cc1ade Branch: refs/heads/ignite-471 Commit: 86cc1ade3bc56a8ba7ae2efcce3e1876c406ba87 Parents: 8e31b7c dfb119f Author: sboikov <sboi...@gridgain.com> Authored: Thu Apr 23 09:07:14 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Apr 23 09:07:14 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(-) ----------------------------------------------------------------------
