You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/01/23 08:15:57 UTC
[45/45] git commit: Merge remote-tracking branch 'origin/master' into
cloud-agent-with-openvswitch
Updated Branches:
refs/heads/cloud-agent-with-openvswitch a0373fe1f -> 363182cf7
refs/heads/master c3f1a9d32 -> 363182cf7
Merge remote-tracking branch 'origin/master' into cloud-agent-with-openvswitch
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/363182cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/363182cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/363182cf
Branch: refs/heads/master
Commit: 363182cf76f8075331497c0c2b6f7a566052019d
Parents: a0373fe c3f1a9d
Author: Hugo Trippaers <tr...@gmail.com>
Authored: Wed Jan 23 08:09:33 2013 +0100
Committer: Hugo Trippaers <tr...@gmail.com>
Committed: Wed Jan 23 08:09:33 2013 +0100
----------------------------------------------------------------------
api/src/com/cloud/resource/ResourceService.java | 5 +-
api/src/com/cloud/server/ManagementService.java | 28 +-
.../api/command/admin/swift/ListSwiftsCmd.java | 10 +-
.../user/offering/ListDiskOfferingsCmd.java | 13 +-
.../user/offering/ListServiceOfferingsCmd.java | 17 +-
.../api/command/user/zone/ListZonesByCmd.java | 13 +-
.../cloudstack/api/response/ZoneResponse.java | 6 +-
.../org/apache/cloudstack/query/QueryService.java | 12 +
.../WEB-INF/classes/resources/messages.properties | 4 +-
plugins/api/discovery/pom.xml | 64 +-
.../api/response/ApiDiscoveryResponse.java | 16 +
.../discovery/ApiDiscoveryServiceImpl.java | 12 +-
.../cloudstack/discovery/ApiDiscoveryTest.java | 87 +
server/src/com/cloud/api/ApiDBUtils.java | 41 +
server/src/com/cloud/api/ApiResponseHelper.java | 145 +-
server/src/com/cloud/api/ApiServer.java | 6 +
.../src/com/cloud/api/query/QueryManagerImpl.java | 469 ++++-
.../com/cloud/api/query/ViewResponseHelper.java | 30 +
.../com/cloud/api/query/dao/DataCenterJoinDao.java | 30 +
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 109 +
.../cloud/api/query/dao/DiskOfferingJoinDao.java | 29 +
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 101 +
.../api/query/dao/ServiceOfferingJoinDao.java | 30 +
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 91 +
.../com/cloud/api/query/vo/DataCenterJoinVO.java | 284 +++
.../com/cloud/api/query/vo/DiskOfferingJoinVO.java | 233 ++
.../cloud/api/query/vo/ServiceOfferingJoinVO.java | 311 +++
.../configuration/DefaultComponentLibrary.java | 6 +
.../src/com/cloud/network/NetworkServiceImpl.java | 24 -
.../com/cloud/resource/ResourceManagerImpl.java | 5 +-
.../com/cloud/server/ConfigurationServerImpl.java | 3 +-
.../src/com/cloud/server/ManagementServerImpl.java | 524 +----
.../src/com/cloud/storage/swift/SwiftManager.java | 3 +-
.../com/cloud/storage/swift/SwiftManagerImpl.java | 7 +-
.../cloud/resource/MockResourceManagerImpl.java | 2 +-
setup/db/create-schema-view.sql | 1845 +++++++++------
setup/db/db/schema-40to410.sql | 1842 +++++++++------
tools/devcloud-kvm/pom.xml | 10 +-
tools/devcloud/devcloud.sql | 2 +-
tools/devcloud/devcloud_internal-mgt.cfg | 121 +
tools/devcloud/pom.xml | 10 +-
ui/css/cloudstack3.css | 8 +
ui/index.jsp | 2 +-
ui/scripts/instanceWizard.js | 38 +-
ui/scripts/ui-custom/instanceWizard.js | 2 +-
45 files changed, 4341 insertions(+), 2309 deletions(-)
----------------------------------------------------------------------