diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-09-11 14:19:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11 14:19:26 +0200 |
| commit | 072b9c5b30dccbb0d375974fc8dd9a5d39710878 (patch) | |
| tree | 73b62e7b3a8547c5a73ef070c16f78bf21ea1660 /orchestrator | |
| parent | 608a89f6e3d0d6832f9854b2fc0d692fee4857f8 (diff) | |
Revert "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, 6 insertions, 5 deletions
diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index 55bf086dfc7..c2091e74435 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -72,6 +72,12 @@ <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 deleted file mode 100644 index a546f8e8a1c..00000000000 --- a/orchestrator/src/main/resources/configdefinitions/orchestrator.def +++ /dev/null @@ -1,5 +0,0 @@ -# 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 |