You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/07/30 23:31:00 UTC
git commit: updated refs/heads/master to 9f66d18
Updated Branches:
refs/heads/master 9b7c4a6c4 -> 9f66d18de
CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9f66d18d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9f66d18d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9f66d18d
Branch: refs/heads/master
Commit: 9f66d18de6dfdc6cbdf6bb4bfdb4fb973c5424f9
Parents: 9b7c4a6
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Jul 30 14:30:53 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Jul 30 14:30:53 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/network/as/AutoScaleManagerImpl.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f66d18d/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
index 8c8a805..13e0cfb 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<Type> 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);