diff options
| author | Jason Tedor <jason@tedor.me> | 2017-06-26 15:18:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-26 15:18:29 -0400 |
| commit | 5a9fc8aa2ae81a6e251de0fa5bad389a1d4e4438 (patch) | |
| tree | 2a69ed88ae75c2b5b655b7010528647936b040ed /core/src/test/java/org/elasticsearch/node | |
| parent | 53b74348ff24eb19d49afad1061a2cbc234612a5 (diff) | |
Remove path.conf setting
This commit removes path.conf as a valid setting and replaces it with a
command-line flag for specifying a non-default path for configuration.
Relates #25392
Diffstat (limited to 'core/src/test/java/org/elasticsearch/node')
| -rw-r--r-- | core/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java b/core/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java index bf23da1868..1ce6ed5779 100644 --- a/core/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java +++ b/core/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java @@ -181,7 +181,7 @@ public class InternalSettingsPreparerTests extends ESTestCase { public void testDefaultPropertiesDoNothing() throws Exception { Map<String, String> props = Collections.singletonMap("default.setting", "foo"); - Environment env = InternalSettingsPreparer.prepareEnvironment(baseEnvSettings, null, props); + Environment env = InternalSettingsPreparer.prepareEnvironment(baseEnvSettings, null, props, null); assertEquals("foo", env.settings().get("default.setting")); assertNull(env.settings().get("setting")); } |