diff options
| author | valerijf <valerijf@yahoo-inc.com> | 2016-08-24 16:22:00 +0200 |
|---|---|---|
| committer | valerijf <valerijf@yahoo-inc.com> | 2016-08-24 16:22:00 +0200 |
| commit | c292c31ae1c9674d379fd52a328adc93a6703c36 (patch) | |
| tree | d9083cc9f2727bf2ea224ded2be2c860b7fabd25 /node-admin/src/main/application | |
| parent | c42439710699a527ff24a672efc31db41b2bd4fd (diff) | |
Fixed git merge error during last revert PR
Diffstat (limited to 'node-admin/src/main/application')
| -rw-r--r-- | node-admin/src/main/application/services.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/node-admin/src/main/application/services.xml b/node-admin/src/main/application/services.xml index bcb489fdf48..fa7307fc5eb 100644 --- a/node-admin/src/main/application/services.xml +++ b/node-admin/src/main/application/services.xml @@ -7,11 +7,6 @@ </handler> <component id="node-admin" class="com.yahoo.vespa.hosted.node.admin.provider.ComponentsProviderImpl" bundle="node-admin"/> <component id="docker" class="com.yahoo.vespa.hosted.node.admin.docker.DockerImpl" bundle="node-admin"/> -<<<<<<< HEAD - <component id="docker-api" class="com.yahoo.vespa.hosted.docker.api.docker.DockerApi" bundle="node-admin"/> - -======= ->>>>>>> parent of e8390df... DO NOT MERGE THIS, just to show impact. <config name='nodeadmin.docker.docker'> <caCertPath>/host/docker/certs/ca_cert.pem</caCertPath> |