Skip to content
Snippets Groups Projects
Commit da0ae7d4 authored by Patryk Kazimierowski's avatar Patryk Kazimierowski
Browse files

Merge branch 'develop' into 254-add-scaling-api

# Conflicts:
#	src/main/java/net/geant/nmaas/portal/api/market/AppInstanceController.java
parents 9b6744f9 a8ca34ab
No related branches found
No related tags found
1 merge request!212Resolve "Add application instance scaling support" -add api
Showing
with 123 additions and 59 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment