diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-09-07 07:40:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 07:40:56 +0200 |
| commit | 69d1d5e192ec55601bbd54374a67d3a5489630b9 (patch) | |
| tree | 0378d78df691703e20ef0000dfa4ccc33eb177ba /orchestrator | |
| parent | 92526ea24add9baecf8e41b3c99fc3adf7b89e49 (diff) | |
| parent | 833d22a74ff9777ae6e3bc24f18d3d50834a1e25 (diff) | |
Merge pull request #3354 from vespa-engine/musum/move-orchestrator-config-definition
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 |