From 9f66d18de6dfdc6cbdf6bb4bfdb4fb973c5424f9 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Tue, 30 Jul 2013 14:30:53 -0700 Subject: [PATCH] CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id --- server/src/com/cloud/network/as/AutoScaleManagerImpl.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java index 8c8a805716b..13e0cfb69e0 100644 --- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java +++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java @@ -338,13 +338,6 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScale */ ApiDispatcher.processParameters(new DeployVMCmd(), deployParams); -<<<<<<< HEAD - if (autoscaleUserId == null) { - autoscaleUserId = CallContext.current().getCallingUserId(); - } - -======= ->>>>>>> a9148d9... CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id AutoScaleVmProfileVO profileVO = new AutoScaleVmProfileVO(cmd.getZoneId(), cmd.getDomainId(), cmd.getAccountId(), cmd.getServiceOfferingId(), cmd.getTemplateId(), cmd.getOtherDeployParams(), cmd.getCounterParamList(), cmd.getDestroyVmGraceperiod(), autoscaleUserId); profileVO = checkValidityAndPersist(profileVO);