Skip to content
Snippets Groups Projects
Commit d6db3f97 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

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
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 82 additions and 82 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment