Merge remote-tracking branch 'remotes/origin/ignite-446' 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/75425c6f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/75425c6f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/75425c6f Branch: refs/heads/ignite-646 Commit: 75425c6f71a7e6b3a526751f501c11c6ad456940 Parents: 2d2db40 e1db6fb Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Apr 23 13:39:02 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Apr 23 13:39:02 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 20 ++ .../ignite/configuration/TopologyValidator.java | 35 ++++ .../GridCachePartitionExchangeManager.java | 5 +- .../distributed/dht/GridDhtTopologyFuture.java | 8 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 7 + .../colocated/GridDhtColocatedLockFuture.java | 24 ++- .../GridDhtPartitionsExchangeFuture.java | 17 ++ .../distributed/near/GridNearLockFuture.java | 26 ++- .../near/GridNearTxPrepareFuture.java | 20 ++ .../cache/IgniteExcangeFutureHistoryTest.java | 74 ++++++++ ...gniteTopologyValidatorAbstractCacheTest.java | 183 +++++++++++++++++++ ...iteTopologyValidatorAbstractTxCacheTest.java | 125 +++++++++++++ ...ValidatorNearPartitionedAtomicCacheTest.java | 30 +++ ...logyValidatorNearPartitionedTxCacheTest.java | 30 +++ ...logyValidatorPartitionedAtomicCacheTest.java | 49 +++++ ...TopologyValidatorPartitionedTxCacheTest.java | 30 +++ ...ologyValidatorReplicatedAtomicCacheTest.java | 49 +++++ ...eTopologyValidatorReplicatedTxCacheTest.java | 30 +++ .../ignite/testsuites/IgniteCacheTestSuite.java | 5 + .../IgniteTopologyValidatorTestSuit.java | 43 +++++ 20 files changed, 802 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75425c6f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ----------------------------------------------------------------------
