Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/78cf60ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/78cf60ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/78cf60ad Branch: refs/heads/ignite-757 Commit: 78cf60adfd77100a964e6baaef833e2a313c0b51 Parents: a5c6bcf 0ee2799 Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Apr 23 10:28:11 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Apr 23 10:28:11 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAffinityManager.java | 12 ------- .../processors/cache/IgniteCacheProxy.java | 15 +++++++-- .../cache/affinity/GridCacheAffinityImpl.java | 2 +- .../preloader/GridDhtPartitionSupplyPool.java | 2 +- .../distributed/near/GridNearAtomicCache.java | 2 +- .../near/GridNearTransactionalCache.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 4 +-- .../IgniteCachePutGetRestartAbstractTest.java | 2 +- ...arDisabledFairAffinityPutGetRestartTest.java | 35 ++++++++++++++++++++ .../IgniteCacheFailoverTestSuite.java | 3 +- 11 files changed, 58 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
