This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 1b985b0 GEODE-3898: fix merge conflict
1b985b0 is described below
commit 1b985b022b28a26608d46cb32cb8e16924fdf649
Author: Jinmei Liao <[email protected]>
AuthorDate: Tue Nov 14 08:54:45 2017 -0800
GEODE-3898: fix merge conflict
---
.../internal/cli/commands/CreateDefinedIndexesCommandDUnitTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandDUnitTest.java
index ddc9637..4206597 100644
---
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandDUnitTest.java
@@ -35,7 +35,7 @@ import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@Category(DistributedTest.class)
@@ -43,7 +43,7 @@ public class CreateDefinedIndexesCommandDUnitTest {
private MemberVM locator, server1, server2, server3;
@Rule
- public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+ public GfshCommandRule gfsh = new GfshCommandRule();
@Rule
public LocatorServerStartupRule locatorServerStartupRule = new
LocatorServerStartupRule();
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
