Merge remote-tracking branch 'origin/health' into health

prdoyle · prdoyle · commit 23fc67563ead · 2025-04-30T13:49:12.000-04:00
diff --git a/server/src/main/java/org/elasticsearch/reservedstate/service/FileSettingsServiceProvider.java b/server/src/main/java/org/elasticsearch/reservedstate/service/FileSettingsServiceProvider.java
@@ -17,6 +17,6 @@ FileSettingsService construct(
         ClusterService clusterService,
         ReservedClusterStateService stateService,
         Environment environment,
-        FileSettingsService.FileSettingsHealthTracker healthIndicatorService
+        FileSettingsService.FileSettingsHealthTracker healthTracker
     );
 }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ FileSettingsService construct(`
`17`	`17`	`ClusterService clusterService,`
`18`	`18`	`ReservedClusterStateService stateService,`
`19`	`19`	`Environment environment,`
`20`		`- FileSettingsService.FileSettingsHealthTracker healthIndicatorService`
	`20`	`+ FileSettingsService.FileSettingsHealthTracker healthTracker`
`21`	`21`	`);`
`22`	`22`	`}`