Merge branch '2.6.1-dev' into '2.6.1-dev-SOL003-VNFLifecycleManagement-API'
# Conflicts: # SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot # SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot # SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot # SOL003/VNFLifecycleManagement-API/Subscriptions.robot # SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot # SOL003/VNFLifecycleManagement-API/VNFInstances.robot # SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
parent
0c9f02c2
Please register or sign in to comment