diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-09-07 10:06:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 10:06:56 +0200 |
| commit | 99e2fb82a9261c3617ddc26fced06c8505b0688a (patch) | |
| tree | 38b6561b530aad9ed5a5b1f50d1d61d00b8d9624 /orchestrator | |
| parent | 6ccede1c4c0caca9fb55ab7a7b5d87e201f78522 (diff) | |
Revert "Move orchestrator.def to configdefinititions/"
Diffstat (limited to 'orchestrator')
| -rw-r--r-- | orchestrator/pom.xml | 6 | ||||
| -rw-r--r-- | orchestrator/src/main/resources/configdefinitions/orchestrator.def | 5 |
2 files changed, 5 insertions, 6 deletions
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/orchestrator/src/main/resources/configdefinitions/orchestrator.def b/orchestrator/src/main/resources/configdefinitions/orchestrator.def new file mode 100644 index 00000000000..a546f8e8a1c --- /dev/null +++ b/orchestrator/src/main/resources/configdefinitions/orchestrator.def @@ -0,0 +1,5 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=vespa.orchestrator + +# TODO: Change the default to actual latency in real setup. +serviceMonitorConvergenceLatencySeconds int default=0 |