From 5e44458ec1ef6b8b977e5c3dd5cbbaa4eddd6cc2 Mon Sep 17 00:00:00 2001 From: Abhinandan Prateek Date: Thu, 3 Nov 2011 11:00:53 +0530 Subject: [PATCH] Revert "bug 11804: Only root admins have a relaxed resource limit now" This reverts commit 5415bd881b4a5b1b81937171fe494509b5e1619e. --- server/src/com/cloud/user/AccountManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index d2a50b86ddc..5d88b4130da 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -353,8 +353,8 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag public boolean resourceLimitExceeded(Account account, ResourceType type, long... count) { long numResources = ((count.length == 0) ? 1 : count[0]); - // Don't place any limits on system or admin accounts for ROOT domain only - if (isAdmin(account.getType()) && account.getDomainId() == 1) { + // Don't place any limits on system or admin accounts + if (isAdmin(account.getType())) { return false; }