Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0000EE8A1 for ; Sat, 26 Jan 2013 05:25:13 +0000 (UTC) Received: (qmail 62293 invoked by uid 500); 26 Jan 2013 05:25:11 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 61754 invoked by uid 500); 26 Jan 2013 05:25:11 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 61114 invoked by uid 99); 26 Jan 2013 05:25:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jan 2013 05:25:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7ECA0825C12; Sat, 26 Jan 2013 05:25:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mlsorensen@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [49/50] git commit: Fix a bug in listHosts that returns wrong zoneId for host. Message-Id: <20130126052509.7ECA0825C12@tyr.zones.apache.org> Date: Sat, 26 Jan 2013 05:25:09 +0000 (UTC) Fix a bug in listHosts that returns wrong zoneId for host. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/17c419ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/17c419ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/17c419ce Branch: refs/heads/add_remove_nics Commit: 17c419ceb4979ebef0cb756ad6ed15e5c95dfbd4 Parents: 2c9e314 Author: Min Chen Authored: Fri Jan 25 14:18:25 2013 -0800 Committer: Min Chen Committed: Fri Jan 25 14:18:25 2013 -0800 ---------------------------------------------------------------------- .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17c419ce/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java index e842383..13b777a 100644 --- a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java @@ -77,7 +77,7 @@ public class HostJoinDaoImpl extends GenericDaoBase implements hostResponse.setCapabilities(host.getCapabilities()); hostResponse.setClusterId(host.getClusterUuid()); hostResponse.setCpuNumber(host.getCpus()); - hostResponse.setZoneId(host.getUuid()); + hostResponse.setZoneId(host.getZoneUuid()); hostResponse.setDisconnectedOn(host.getDisconnectedOn()); hostResponse.setHypervisor(host.getHypervisorType()); hostResponse.setHostType(host.getType());