Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-446
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/29091c3f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/29091c3f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/29091c3f Branch: refs/heads/ignite-646 Commit: 29091c3fadadb60e1a3c631f8c1a1503c443c12f Parents: b69f37a 0ee2799 Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Apr 23 11:56:56 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Apr 23 11:56:56 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(-) ----------------------------------------------------------------------
