Repository: ignite Updated Branches: refs/heads/ignite-6467 181fdef29 -> 0f4f16c8d
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/0f4f16c8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0f4f16c8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0f4f16c8 Branch: refs/heads/ignite-6467 Commit: 0f4f16c8d0ee97164065bcb9e636102da23a0781 Parents: 181fdef Author: sboikov <sboi...@apache.org> Authored: Sat Jul 28 13:24:09 2018 +0300 Committer: sboikov <sboi...@apache.org> Committed: Sat Jul 28 13:24:50 2018 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/CacheExchangeMergeTest.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0f4f16c8/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 7c18f6b..bfdfa91 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 @@ -278,6 +278,8 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest { } finally { System.clearProperty(IgniteSystemProperties.IGNITE_EXCHANGE_MERGE_DELAY); + + TestDebugLog1.clear(); } } @@ -301,6 +303,8 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest { */ private void concurrentStart(final boolean withClients) throws Exception { for (int i = 0; i < 5; i++) { + TestDebugLog1.clear(); + log.info("Iteration: " + i); startGrid(0);
