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 0BF0510638 for ; Wed, 16 Oct 2013 21:45:58 +0000 (UTC) Received: (qmail 88846 invoked by uid 500); 16 Oct 2013 21:45:42 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 88763 invoked by uid 500); 16 Oct 2013 21:45:35 -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 88688 invoked by uid 99); 16 Oct 2013 21:45:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Oct 2013 21:45:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5C8C2916546; Wed, 16 Oct 2013 21:45:28 +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: Wed, 16 Oct 2013 21:45:35 -0000 Message-Id: <7643ce0a6d7244bda54391cae5ecf92d@git.apache.org> In-Reply-To: <87123c12a66144cd8d17e11b3ee3a803@git.apache.org> References: <87123c12a66144cd8d17e11b3ee3a803@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/8] git commit: updated refs/heads/ui-restyle to 116e06e 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/116e06e3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/116e06e3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/116e06e3 Branch: refs/heads/ui-restyle Commit: 116e06e3ba99fff0cbced84a8097ed5b383e720a Parents: 2edd97e 81d078f Author: Brian Federle Authored: Wed Oct 16 14:45:13 2013 -0700 Committer: Brian Federle Committed: Wed Oct 16 14:45:13 2013 -0700 ---------------------------------------------------------------------- api/src/com/cloud/server/ResourceTag.java | 3 +- .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../user/offering/ListServiceOfferingsCmd.java | 31 +++++++++++++++- .../api/response/ServiceOfferingResponse.java | 21 ++++++++--- .../com/cloud/upgrade/dao/Upgrade307to410.java | 30 ++++++++++++++- .../com/cloud/upgrade/dao/Upgrade40to41.java | 30 ++++++++++++++- .../apache/cloudstack/region/dao/RegionDao.java | 2 +- .../cloudstack/region/dao/RegionDaoImpl.java | 5 +++ .../db/src/com/cloud/utils/db/GenericDao.java | 2 - .../src/com/cloud/utils/db/GenericDaoBase.java | 5 --- .../db/src/com/cloud/utils/db/Transaction.java | 7 ---- .../kvm/resource/LibvirtComputingResource.java | 2 +- server/src/com/cloud/api/ApiDBUtils.java | 4 ++ .../com/cloud/api/query/QueryManagerImpl.java | 39 ++++++++++++++++++-- .../cloud/api/query/dao/ResourceTagJoinDao.java | 3 ++ .../api/query/dao/ResourceTagJoinDaoImpl.java | 25 ++++++++++--- .../query/dao/ServiceOfferingJoinDaoImpl.java | 18 ++++++--- .../com/cloud/network/IpAddressManagerImpl.java | 23 +++++++++--- .../cloud/tags/TaggedResourceManagerImpl.java | 14 ++++--- .../cloud/uuididentity/dao/IdentityDaoImpl.java | 8 +++- .../cloudstack/region/RegionManagerImpl.java | 31 +++++++++++++++- setup/db/db/schema-420to421.sql | 3 ++ setup/db/templates.sql | 4 -- ui/css/cloudstack3.css | 2 +- ui/scripts/instances.js | 2 +- .../vmware/util/VmwareGuestOsMapper.java | 2 +- 26 files changed, 255 insertions(+), 62 deletions(-) ----------------------------------------------------------------------