From: Krisztián Lengyel <krisztian.lengyel@nokia.com>
Date: Thu, 22 Aug 2019 09:05:38 +0000 (+0000)
Subject: Merge "Revert "Docker update""
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fmanifest.git;a=commitdiff_plain;h=e2b4e23b3eebc357c76d6cbb158a4662fa34bfc9;hp=-c

Merge "Revert "Docker update""
---

e2b4e23b3eebc357c76d6cbb158a4662fa34bfc9
diff --combined packages.yaml
index 1bbb13c,c5238f5..6934676
--- a/packages.yaml
+++ b/packages.yaml
@@@ -13,9 -13,9 +13,9 @@@ image-provision
  product-manifest:
  access-management:
  ansible-2.4.4.0-1.el7.ans.noarch:
- containerd.io-1.2.6-3.3.el7.x86_64:
- docker-ce-18.09.7-3.el7.x86_64:
- docker-ce-cli-18.09.7-3.el7.x86_64:
+ containerd.io-1.2.2-3.3.el7.x86_64:
+ docker-ce-18.09.2-3.el7.x86_64:
+ docker-ce-cli-18.09.2-3.el7.x86_64:
  caas-chartrepo:
  caas-cpupooler:
  caas-custom_metrics:
@@@ -25,17 -25,18 +25,17 @@@ caas-etcd
  caas-flannel:
  caas-fluentd:
  caas-helm:
 +caas-hyperdanm:
  caas-infra-charts:
  caas-instantiate:
  caas-kubedns:
  caas-kubernetes:
  caas-lcm:
  caas-metrics_server:
 -caas-netwatcher:
  caas-prometheus:
  caas-registry:
  caas-security:
  caas-sriovdp:
 -caas-svcwatcher:
  caas-swift:
  caas-utils:
  ceph: