diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-09-11 18:41:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-11 18:41:54 +0200 |
| commit | 807761ce70f955f20fcc26dbd4d857e4f0c5fdb2 (patch) | |
| tree | f7545a1913f5a502779bc80f7cc50c131442cf7c /container-disc | |
| parent | b9d08a9fe934e1d94a7402ad5e9f9b7cfd990633 (diff) | |
| parent | 64ebd3904a7e76072e3841bed45cf7e408542f4f (diff) | |
Merge pull request #14370 from vespa-engine/hmusum/move-config-definitions-to-use-full-name-in-filename
Use full name in config definition file names
Diffstat (limited to 'container-disc')
| -rw-r--r-- | container-disc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-connection.def (renamed from container-disc/src/main/resources/configdefinitions/jersey-connection.def) | 0 | ||||
| -rw-r--r-- | container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-web-app-pool.def (renamed from container-disc/src/main/resources/configdefinitions/jersey-web-app-pool.def) | 0 | ||||
| -rw-r--r-- | container-disc/src/main/resources/configdefinitions/container.jdisc.jdisc-bindings.def (renamed from container-disc/src/main/resources/configdefinitions/jdisc-bindings.def) | 0 |
4 files changed, 1 insertions, 3 deletions
diff --git a/container-disc/CMakeLists.txt b/container-disc/CMakeLists.txt index 7eaf845a883..3d781a95075 100644 --- a/container-disc/CMakeLists.txt +++ b/container-disc/CMakeLists.txt @@ -3,6 +3,4 @@ install_fat_java_artifact(container-disc) vespa_install_script(src/main/sh/vespa-start-container-daemon.sh vespa-start-container-daemon bin) -install_config_definition(src/main/resources/configdefinitions/jdisc-bindings.def container.jdisc.jdisc-bindings.def) -install_config_definition(src/main/resources/configdefinitions/jersey-connection.def container.config.jersey.jersey-connection.def) -install_config_definition(src/main/resources/configdefinitions/jersey-web-app-pool.def container.config.jersey.jersey-web-app-pool.def) +install_config_definitions(src/main/resources/configdefinitions) diff --git a/container-disc/src/main/resources/configdefinitions/jersey-connection.def b/container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-connection.def index b8662e07bf9..b8662e07bf9 100644 --- a/container-disc/src/main/resources/configdefinitions/jersey-connection.def +++ b/container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-connection.def diff --git a/container-disc/src/main/resources/configdefinitions/jersey-web-app-pool.def b/container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-web-app-pool.def index 52cb9f2229a..52cb9f2229a 100644 --- a/container-disc/src/main/resources/configdefinitions/jersey-web-app-pool.def +++ b/container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-web-app-pool.def diff --git a/container-disc/src/main/resources/configdefinitions/jdisc-bindings.def b/container-disc/src/main/resources/configdefinitions/container.jdisc.jdisc-bindings.def index c1b65d39d7a..c1b65d39d7a 100644 --- a/container-disc/src/main/resources/configdefinitions/jdisc-bindings.def +++ b/container-disc/src/main/resources/configdefinitions/container.jdisc.jdisc-bindings.def |