Fix conflicts

elastic · Aug 19, 2021 · 8c2a73d · 8c2a73d
1 parent 4d40382
commit 8c2a73d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 24 deletions.
diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml
@@ -15,19 +15,11 @@ services:
 
   # Used by base tests
   elasticsearch:
-<<<<<<< HEAD
-    image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.13.4}-1
-    build:
-      context: ./module/elasticsearch/_meta
-      args:
-        ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.13.4}
-=======
     image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.14.0}-1
     build:
       context: ./module/elasticsearch/_meta
       args:
         ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.14.0}
->>>>>>> 2eb4601695 ([Metricbeat] CI: update stack to 7.14 (#27416))
     environment:
       - "ES_JAVA_OPTS=-Xms256m -Xmx256m"
       - "network.host="
@@ -45,19 +37,11 @@ services:
 
   # Used by base tests
   kibana:
-<<<<<<< HEAD
-    image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.13.4}-1
-    build:
-      context: ./module/kibana/_meta
-      args:
-        KIBANA_VERSION: ${KIBANA_VERSION:-7.13.4}
-=======
     image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.14.0}-1
     build:
       context: ./module/kibana/_meta
       args:
         KIBANA_VERSION: ${KIBANA_VERSION:-7.14.0}
->>>>>>> 2eb4601695 ([Metricbeat] CI: update stack to 7.14 (#27416))
     depends_on:
       - elasticsearch
     ports:

diff --git a/x-pack/metricbeat/docker-compose.yml b/x-pack/metricbeat/docker-compose.yml
@@ -24,19 +24,11 @@ services:
   kibana:
     # Copied configuration from OSS metricbeat because services with depends_on
     # cannot be extended with extends
-<<<<<<< HEAD
-    image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.13.4}-1
-    build:
-      context: ../../metricbeat/module/kibana/_meta
-      args:
-        KIBANA_VERSION: ${KIBANA_VERSION:-7.13.4}
-=======
     image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.14.0}-1
     build:
       context: ../../metricbeat/module/kibana/_meta
       args:
         KIBANA_VERSION: ${KIBANA_VERSION:-7.14.0}
->>>>>>> 2eb4601695 ([Metricbeat] CI: update stack to 7.14 (#27416))
     depends_on:
       - elasticsearch
     ports: