Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-420 de08779ce -> c8c2bdd8a
GEODE-420: Fixing test LocatorDUnitTest.java due to merge issue Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c8c2bdd8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c8c2bdd8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c8c2bdd8 Branch: refs/heads/feature/GEODE-420 Commit: c8c2bdd8a011d46864b6ca47ecd96b9838277196 Parents: de08779 Author: Udo Kohlmeyer <[email protected]> Authored: Wed Aug 31 07:43:42 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> Committed: Wed Aug 31 07:43:42 2016 +1000 ---------------------------------------------------------------------- .../java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c8c2bdd8/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java index 2faa606..fc0e93b 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java @@ -1556,6 +1556,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase { dsProps.setProperty(LOCATORS, locators); dsProps.setProperty(MCAST_PORT, "0"); dsProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false"); + addDSProps(dsProps); vm0.invoke("start Locator1", () -> startLocator(port1, dsProps)); try {
