Return-Path: 
 <commits-return-34652-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B992010663
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Fri, 15 Nov 2013 20:02:56 +0000 (UTC)
Received: (qmail 38735 invoked by uid 500); 15 Nov 2013 20:02:48 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 38636 invoked by uid 500); 15 Nov 2013 20:02:48 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 37962 invoked by uid 99); 15 Nov 2013 20:02:47 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Nov 2013 20:02:47 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 6B19382F512; Fri, 15 Nov 2013 20:02:47 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bfederle@apache.org
To: commits@cloudstack.apache.org
Date: Fri, 15 Nov 2013 20:03:10 -0000
Message-Id: <effb50541fc4403eae9cc2d800de3a55@git.apache.org>
In-Reply-To: <ea516aea5fb0467da0b6f3c90191acda@git.apache.org>
References: <ea516aea5fb0467da0b6f3c90191acda@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [25/50] git commit: updated refs/heads/ui-restyle to 06ccb84

Revert "XS host free memory might change, if user manually changes dom0 memory,"

This reverts commit a1d09ae16f08c86bfca5c4a89dec371ef6d3ee67.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/74153e4a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/74153e4a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/74153e4a

Branch: refs/heads/ui-restyle
Commit: 74153e4a79a064139a6ecce48f8eb1308318beab
Parents: 253da8f
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Wed Nov 13 15:37:45 2013 -0800
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Wed Nov 13 15:38:42 2013 -0800

----------------------------------------------------------------------
 .../src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java  | 2 +-
 server/src/com/cloud/capacity/CapacityManagerImpl.java             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74153e4a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 7a112ae..aadfc17 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -6035,7 +6035,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
             Set<VM> vms = host.getResidentVMs(conn);
             for (VM vm : vms) {
                 if (vm.getIsControlDomain(conn)) {
-                    dom0Ram = vm.getMemoryStaticMax(conn);
+                    dom0Ram = vm.getMemoryDynamicMax(conn);
                     break;
                 }
             }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74153e4a/server/src/com/cloud/capacity/CapacityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 19cf70e..70491bc 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -589,7 +589,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
 
         CapacityVO cpuCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_CPU);
         CapacityVO memCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_MEMORY);
-        memCap.setTotalCapacity(host.getTotalMemory());
+
         if (cpuCap != null && memCap != null){
 
             long hostTotalCpu = host.getCpus().longValue() * host.getSpeed().longValue();