Merge remote-tracking branch 'origin/ignite-sprint-4' 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/a6132bba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a6132bba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a6132bba Branch: refs/heads/ignite-646 Commit: a6132bbade24683a0b5360e8c34a8482208eaa6e Parents: 8b7364b a09cc08 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Apr 23 17:17:44 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Apr 23 17:17:44 2015 +0700 ---------------------------------------------------------------------- .../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 ++++++++++++++++++++ .../testframework/junits/GridAbstractTest.java | 2 +- .../IgniteCacheFailoverTestSuite.java | 3 +- .../ignite/internal/GridFactorySelfTest.java | 3 +- 13 files changed, 61 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
