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 4DC2B10685 for ; Tue, 8 Oct 2013 00:13:06 +0000 (UTC) Received: (qmail 51934 invoked by uid 500); 8 Oct 2013 00:13:05 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 51907 invoked by uid 500); 8 Oct 2013 00:13:05 -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 51867 invoked by uid 99); 8 Oct 2013 00:13:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Oct 2013 00:13:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7AFBE911F99; Tue, 8 Oct 2013 00:13:05 +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: Tue, 08 Oct 2013 00:13:08 -0000 Message-Id: <56f0eaf60ea341cdb38934f16ff84fa9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: updated refs/heads/ui-restyle to 019e075 Merge branch 'master' into ui-restyle Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/019e0759 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/019e0759 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/019e0759 Branch: refs/heads/ui-restyle Commit: 019e075987a65ff0b14244f1a63fc57fca2c456b Parents: 63335cf 6e80bb0 Author: Brian Federle Authored: Mon Oct 7 17:12:51 2013 -0700 Committer: Brian Federle Committed: Mon Oct 7 17:12:51 2013 -0700 ---------------------------------------------------------------------- api/src/com/cloud/server/ResourceTag.java | 3 +- .../src/com/cloud/dc/dao/DcDetailsDao.java | 5 ++ .../src/com/cloud/dc/dao/DcDetailsDaoImpl.java | 25 ++++++++- .../com/cloud/api/query/QueryManagerImpl.java | 37 ++++++++++++-- .../cloud/api/query/vo/StoragePoolJoinVO.java | 18 ++++--- .../metadata/ResourceMetaDataManagerImpl.java | 16 +++++- .../cloud/tags/TaggedResourceManagerImpl.java | 4 ++ setup/db/db/schema-420to430.sql | 54 ++++++++++++++++++++ ui/scripts/network.js | 6 ++- ui/scripts/ui-custom/granularSettings.js | 3 ++ usage/src/com/cloud/usage/UsageManagerImpl.java | 8 +-- 11 files changed, 160 insertions(+), 19 deletions(-) ----------------------------------------------------------------------