Repository: ignite Updated Branches: refs/heads/ignite-6467 7f635688f -> 9c87026a9
Merge remote-tracking branch 'remotes/origin/master' into ignite-6467 # Conflicts: # modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9c87026a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9c87026a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9c87026a Branch: refs/heads/ignite-6467 Commit: 9c87026a911ef0d290844adc8646762f55f350f3 Parents: 7f63568 Author: sboikov <sboi...@apache.org> Authored: Sat Jul 28 11:02:16 2018 +0300 Committer: sboikov <sboi...@apache.org> Committed: Sat Jul 28 11:02:16 2018 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/CacheExchangeMergeTest.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9c87026a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java index 6502d3d..8d0201c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java @@ -41,6 +41,8 @@ import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.cluster.ClusterTopologyException; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.DiscoveryEvent; import org.apache.ignite.events.Event; @@ -123,6 +125,10 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); + DataStorageConfiguration cfg1 = new DataStorageConfiguration(); + cfg1.setDefaultDataRegionConfiguration(new DataRegionConfiguration().setMaxSize(128 * 1024 * 1024)); + cfg.setDataStorageConfiguration(cfg1); + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); if (testSpi)
