diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-09-07 10:07:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 10:07:42 +0200 |
| commit | de8c68fc845fd90f1c93c9003b99edd9967ade6a (patch) | |
| tree | 38b6561b530aad9ed5a5b1f50d1d61d00b8d9624 | |
| parent | 6ccede1c4c0caca9fb55ab7a7b5d87e201f78522 (diff) | |
| parent | 99e2fb82a9261c3617ddc26fced06c8505b0688a (diff) | |
Merge pull request #3357 from vespa-engine/revert-3354-musum/move-orchestrator-config-definition
Revert "Move orchestrator.def to configdefinititions/"
| -rw-r--r-- | configdefinitions/src/vespa/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | orchestrator/pom.xml | 6 | ||||
| -rw-r--r-- | orchestrator/src/main/resources/configdefinitions/orchestrator.def (renamed from configdefinitions/src/vespa/orchestrator.def) | 0 |
3 files changed, 0 insertions, 8 deletions
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index 1566e97ff3a..96a48acb72b 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -34,8 +34,6 @@ vespa_generate_config(configdefinitions messagetyperouteselectorpolicy.def) install(FILES messagetyperouteselectorpolicy.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(configdefinitions model.def) install(FILES model.def DESTINATION var/db/vespa/config_server/serverdb/classes) -vespa_generate_config(configdefinitions orchestrator.def) -install(FILES orchestrator.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(configdefinitions persistence.def) install(FILES persistence.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(configdefinitions rank-profiles.def) diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index c2091e74435..55bf086dfc7 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -72,12 +72,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>configdefinitions</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-proxy-client</artifactId> <exclusions> diff --git a/configdefinitions/src/vespa/orchestrator.def b/orchestrator/src/main/resources/configdefinitions/orchestrator.def index a546f8e8a1c..a546f8e8a1c 100644 --- a/configdefinitions/src/vespa/orchestrator.def +++ b/orchestrator/src/main/resources/configdefinitions/orchestrator.def |