diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-11-16 11:48:16 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-11-16 11:48:16 +0100 |
| commit | dd071ebc655801665b14a798757548f6a04f2b05 (patch) | |
| tree | 064b36c34a62cc75f29739ac8693294228e69eeb /docker | |
| parent | f50dff6b8c5b349ea43b85b15002931c46aa96a7 (diff) | |
Fix cherry-pick mistakes
Change-Id: I891a8bb9f1440688dd17bda750d6e9fca17eb7a6
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/vnf/Dockerfile | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 46e5212d6..198f098c0 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -1,14 +1,8 @@ FROM opnfv/functest-core:hunter -<<<<<<< HEAD ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky -ARG VIMS_TEST_TAG=release-129 -======= -ARG BRANCH=master -ARG OPENSTACK_TAG=master ARG VIMS_TEST_TAG=release-130 ->>>>>>> 3ac3d8d... Switch to Clearwater Zamin (heat_ims) ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909 ARG CLOUDIFY_VIMS_TAG=fraser ARG HEAT_VIMS_TAG=release-130 |