diff options
Diffstat (limited to 'docker/vnf/Dockerfile')
| -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 |