This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a commit to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-7665 by this
push:
new faed099 fix rebase compiling error
faed099 is described below
commit faed099fed729a33144fcef38a9fb53581af0643
Author: Jinmei Liao <[email protected]>
AuthorDate: Fri Oct 2 16:31:28 2020 -0700
fix rebase compiling error
---
.../org/apache/geode/cache/PRCacheListenerDistributedTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
index 7d95473..ac02b65 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
@@ -39,9 +39,9 @@ import
org.junit.runners.Parameterized.UseParametersRunnerFactory;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.logging.internal.log4j.api.LogService;
import org.apache.geode.test.dunit.rules.CacheRule;
+import org.apache.geode.test.dunit.rules.DistributedCounters;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedCountersRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
@@ -75,9 +75,9 @@ public class PRCacheListenerDistributedTest implements
Serializable {
@Rule
public SerializableTestName testName = new SerializableTestName();
@Rule
- public SharedCountersRule sharedCountersRule = new SharedCountersRule();
+ public DistributedCounters sharedCountersRule = new DistributedCounters();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new
DistributedErrorCollector();
protected String regionName;
@Parameters