diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-11-14 17:23:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-14 17:23:45 +0100 |
commit | 1741e47163644d01db6a67f458427c8aafe8f0b4 (patch) | |
tree | 1dfc35571fc672a8acfb100f6d7b3496cc120400 /configdefinitions | |
parent | 55a922d6af49b8d5337dc2249e07c33c8d00e61e (diff) | |
parent | 6be6eb658bf8fe99a019309f12e3331acc4cb0f2 (diff) |
Merge pull request #4130 from vespa-engine/revert-4125-hmusum/move-filedistribution-config-to-configdefinitions
Revert "Move filedistribution config definitions to configdefinitions module"
Diffstat (limited to 'configdefinitions')
-rw-r--r-- | configdefinitions/src/vespa/CMakeLists.txt | 4 | ||||
-rw-r--r-- | configdefinitions/src/vespa/filedistributor.def | 10 | ||||
-rw-r--r-- | configdefinitions/src/vespa/filereferences.def | 3 |
3 files changed, 0 insertions, 17 deletions
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index fc9be8ce91b..9297383c53f 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -16,10 +16,6 @@ vespa_generate_config(configdefinitions configserver.def) install_config_definition(configserver.def cloud.config.configserver.def) vespa_generate_config(configdefinitions dispatch.def) install_config_definition(dispatch.def vespa.config.search.dispatch.def) -vespa_generate_config(configdefinitions filedistributor.def) -install_config_definition(filedistributor.def cloud.config.filedistribution.filedistributor.def) -vespa_generate_config(configdefinitions filereferences.def) -install_config_definition(filereferences.def cloud.config.filedistribution.filereferences.def) vespa_generate_config(configdefinitions fleetcontroller.def) install_config_definition(fleetcontroller.def vespa.config.content.fleetcontroller.def) vespa_generate_config(configdefinitions ilscripts.def) diff --git a/configdefinitions/src/vespa/filedistributor.def b/configdefinitions/src/vespa/filedistributor.def deleted file mode 100644 index 13dd373eac6..00000000000 --- a/configdefinitions/src/vespa/filedistributor.def +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=cloud.config.filedistribution - -torrentport int -stateport int default = 0 -hostname string -filedbpath string - -maxdownloadspeed double -maxuploadspeed double diff --git a/configdefinitions/src/vespa/filereferences.def b/configdefinitions/src/vespa/filereferences.def deleted file mode 100644 index 03e071959ce..00000000000 --- a/configdefinitions/src/vespa/filereferences.def +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=cloud.config.filedistribution -filereferences[] string |