From: Michal Ptacek <m.ptacek@partner.samsung.com>
Date: Wed, 10 Jul 2019 04:57:37 +0000 (+0000)
Subject: Merge changes Iee382756,I473f022c
X-Git-Tag: 6.0.0-ONAP~119
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=569c3103f4343017a535e46426cbdcd51ad54e61;p=oom%2Foffline-installer.git

Merge changes Iee382756,I473f022c

* changes:
  Allow overriding docker version in prepare-docker-dind
  Specify source ip for rancher agent
---

569c3103f4343017a535e46426cbdcd51ad54e61