Merge remote-tracking branch 'remotes/origin/master' into ignite-1279
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c9b7f421 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c9b7f421 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c9b7f421 Branch: refs/heads/ignite-1279 Commit: c9b7f4211091fedd54723a6318ea40076b658989 Parents: 7d251a9 04930ca Author: sboikov <[email protected]> Authored: Mon Sep 28 15:55:37 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Sep 28 15:55:37 2015 +0300 ---------------------------------------------------------------------- .../computegrid/ComputeClosureExample.java | 2 +- .../managers/discovery/CustomEventListener.java | 4 +- .../discovery/GridDiscoveryManager.java | 2 +- .../cache/DynamicCacheChangeRequest.java | 19 +++ .../cache/DynamicCacheDescriptor.java | 19 +++ .../GridCachePartitionExchangeManager.java | 20 ++- .../processors/cache/GridCacheProcessor.java | 15 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../continuous/CacheContinuousQueryHandler.java | 10 +- .../continuous/GridContinuousProcessor.java | 17 ++- .../datastructures/DataStructuresProcessor.java | 6 +- .../cache/IgniteDynamicCacheFilterTest.java | 150 +++++++++++++++++++ ...omicOffheapQueueCreateMultiNodeSelfTest.java | 5 - ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 5 - ...PartitionedQueueCreateMultiNodeSelfTest.java | 16 +- .../IgniteTxPreloadAbstractTest.java | 43 +++--- .../replicated/GridReplicatedTxPreloadTest.java | 2 - .../testsuites/IgniteCacheTestSuite4.java | 10 ++ pom.xml | 16 ++ 19 files changed, 308 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c9b7f421/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index cfa3cd3,959ceb1..80d53e9 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@@ -262,8 -265,12 +266,14 @@@ public class IgniteCacheTestSuite4 exte suite.addTestSuite(CacheSwapUnswapGetTest.class); + suite.addTestSuite(GridCacheDhtTxPreloadSelfTest.class); + suite.addTestSuite(GridCacheNearTxPreloadSelfTest.class); + suite.addTestSuite(GridReplicatedTxPreloadTest.class); + + suite.addTestSuite(IgniteDynamicCacheFilterTest.class); + + suite.addTestSuite(CrossCacheLockTest.class); + return suite; } }
