diff options
| author | Harald Musum <musum@yahooinc.com> | 2024-01-15 20:23:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-15 20:23:57 +0100 |
| commit | 0ce3abacb981dc8e04fa54bc015f57e24a43a7fd (patch) | |
| tree | ae77beadabd9d39b8092b7c215b79566eaad9c80 /config-model-api | |
| parent | e6120bdf3176e0d40141a32d6a7326794fba857f (diff) | |
| parent | dd7765dec94031a2f89f93fc0b9c63f9ba28c7aa (diff) | |
Merge pull request #29916 from vespa-engine/revert-29903-jonmv/two-phase-deploy
Revert "Move cluster restarting -> defer config inside model"
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/abi-spec.json | 1 | ||||
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index 725892f8ce6..ccd256d0c88 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -1374,7 +1374,6 @@ "public abstract com.yahoo.config.application.api.FileRegistry getFileRegistry()", "public abstract java.util.concurrent.ExecutorService getExecutor()", "public java.util.Optional reindexing()", - "public java.util.Set restartingClusters()", "public abstract com.yahoo.config.model.api.ModelContext$Properties properties()", "public java.util.Optional appDir()", "public abstract com.yahoo.config.model.api.OnnxModelCost onnxModelCost()", diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 6e1127f9cf9..9b75f4bcdda 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -43,7 +43,6 @@ public interface ModelContext { FileRegistry getFileRegistry(); ExecutorService getExecutor(); default Optional<? extends Reindexing> reindexing() { return Optional.empty(); } - default Set<ClusterSpec.Id> restartingClusters() { return Set.of(); } Properties properties(); default Optional<File> appDir() { return Optional.empty(); } OnnxModelCost onnxModelCost(); |