cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [8/8] git commit: updated refs/heads/ui-restyle to 116e06e
Date Wed, 16 Oct 2013 21:45:35 GMT
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 <brian.federle@citrix.com>
Authored: Wed Oct 16 14:45:13 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
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(-)
----------------------------------------------------------------------



Mime
View raw message