Return-Path: 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 6BCDD10D0D for ; Mon, 1 Jul 2013 21:23:13 +0000 (UTC) Received: (qmail 4921 invoked by uid 500); 1 Jul 2013 21:23:13 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 4902 invoked by uid 500); 1 Jul 2013 21:23:13 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 4895 invoked by uid 99); 1 Jul 2013 21:23:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jul 2013 21:23:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1ADEF45C57; Mon, 1 Jul 2013 21:23:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: commits@cloudstack.apache.org Message-Id: <4b8895ab990244bea7e767dd4293d982@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master-6-17-stable to e81c2c5 Date: Mon, 1 Jul 2013 21:23:13 +0000 (UTC) Updated Branches: refs/heads/master-6-17-stable 737a9c397 -> e81c2c539 CLOUDSTACK-2084: API - when account type is ACCOUNT_TYPE_PROJECT, make listVlanIpRanges API to return accountName. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e81c2c53 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e81c2c53 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e81c2c53 Branch: refs/heads/master-6-17-stable Commit: e81c2c539402377b630e7d131821cdd10b777e85 Parents: 737a9c3 Author: Jessica Wang Authored: Mon Jul 1 14:19:46 2013 -0700 Committer: Jessica Wang Committed: Mon Jul 1 14:22:56 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/api/ApiResponseHelper.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e81c2c53/server/src/com/cloud/api/ApiResponseHelper.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 04bba3e..875d18b 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -2527,6 +2527,7 @@ public class ApiResponseHelper implements ResponseGenerator { Project project = ApiDBUtils.findProjectByProjectAccountIdIncludingRemoved(account.getId()); response.setProjectId(project.getUuid()); response.setProjectName(project.getName()); + response.setAccountName(account.getAccountName()); } else { response.setAccountName(account.getAccountName()); }