Merge remote-tracking branch 'origin/4.14'

This commit is contained in:
Rohit Yadav 2020-06-17 08:10:32 +05:30
commit 2a82fb99ce

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)) {