From 0a034da81cdcce51d3ea5d0bcaaa0a05d73cab97 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 17 Jun 2020 08:06:19 +0530 Subject: [PATCH] Merge remote-tracking branch 'origin/4.13' into 4.14 Fixes build failure due to forward merge Signed-off-by: Rohit Yadav --- server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java index 86ac9f5f961..881c37d7857 100644 --- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java @@ -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)) {