Skip to content

Commit 66085c5

Browse files
committed
removed unwanted settings added during conflict resolve
Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>
1 parent 8f94e31 commit 66085c5

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

server/src/main/java/org/opensearch/common/settings/ClusterSettings.java

-10
Original file line numberDiff line numberDiff line change
@@ -838,16 +838,6 @@ public void apply(Settings value, Settings current, Settings previous) {
838838
TelemetrySettings.METRICS_PUBLISH_INTERVAL_SETTING,
839839
TelemetrySettings.TRACER_FEATURE_ENABLED_SETTING,
840840
TelemetrySettings.METRICS_FEATURE_ENABLED_SETTING
841-
),
842-
List.of(FeatureFlags.PLUGGABLE_CACHE),
843-
List.of(
844-
CacheSettings.getConcreteStoreNameSettingForCacheType(CacheType.INDICES_REQUEST_CACHE),
845-
OpenSearchOnHeapCacheSettings.MAXIMUM_SIZE_IN_BYTES.getConcreteSettingForNamespace(
846-
CacheType.INDICES_REQUEST_CACHE.getSettingPrefix()
847-
),
848-
OpenSearchOnHeapCacheSettings.EXPIRE_AFTER_ACCESS_SETTING.getConcreteSettingForNamespace(
849-
CacheType.INDICES_REQUEST_CACHE.getSettingPrefix()
850-
)
851841
)
852842
);
853843
}

0 commit comments

Comments
 (0)