etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.13' into 4.14 

Fixes build failure due to forward merge

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2020-06-17 08:06:19 +05:30
parent c94315545f
commit 0a034da81c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
View File

@ -1755,7 +1755,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
return true;
}
restartVPCNetworks(vpcId, callerAccount, callerUser, cleanUp);
restartVPCNetworks(vpcId, callerAccount, user, cleanUp);
s_logger.debug("Starting VPC " + vpc + " as a part of VPC restart process without cleanup");
if (!startVpc(vpcId, false)) {