Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-157-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6580960f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6580960f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6580960f Branch: refs/heads/ignite-837 Commit: 6580960fd1e91da5b26704b333c1a7edac9e7ddc Parents: 7013c2b 0ee2799 Author: sboikov <sboi...@gridgain.com> Authored: Thu Apr 23 10:35:18 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Apr 23 10:35:18 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(-) ----------------------------------------------------------------------
