You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2013/01/28 13:22:51 UTC
[46/50] [abbrv] git commit: Merge branch 'master' into regions
Merge branch 'master' into regions
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c6ae19d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c6ae19d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c6ae19d1
Branch: refs/heads/regions
Commit: c6ae19d12fc0e4a89478e9c0be513587f606a6bf
Parents: de20cb6 44ceff4
Author: Kishan Kavala <ki...@cloud.com>
Authored: Fri Jan 25 18:49:47 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Fri Jan 25 18:49:47 2013 +0530
----------------------------------------------------------------------
agent/conf/agent.properties | 11 +
api/src/com/cloud/dao/EntityManager.java | 9 +
api/src/com/cloud/resource/ResourceService.java | 5 +-
api/src/com/cloud/server/ManagementService.java | 10 -
.../api/BaseListAccountResourcesCmd.java | 2 +-
.../admin/network/CreateNetworkOfferingCmd.java | 4 +-
.../api/command/admin/swift/ListSwiftsCmd.java | 10 +-
.../api/command/user/iso/AttachIsoCmd.java | 2 +-
.../api/command/user/iso/DetachIsoCmd.java | 2 +-
.../api/command/user/template/CopyTemplateCmd.java | 2 +-
.../command/user/template/DeleteTemplateCmd.java | 4 +-
.../command/user/template/ExtractTemplateCmd.java | 4 +-
.../api/command/user/vpc/ListVPCsCmd.java | 17 -
.../api/command/user/zone/ListZonesByCmd.java | 13 +-
.../cloudstack/api/response/ZoneResponse.java | 6 +-
.../org/apache/cloudstack/query/QueryService.java | 4 +
docs/en-US/host-add-xenserver-kvm-ovm.xml | 5 +
...hypervisor-host-install-network-openvswitch.xml | 116 +
docs/en-US/hypervisor-host-install-network.xml | 3 +-
docs/en-US/hypervisor-kvm-install-flow.xml | 3 +-
docs/en-US/hypervisor-kvm-requirements.xml | 7 +-
docs/en-US/offerings.xml | 32 +-
docs/en-US/plugin-niciranvp-features.xml | 8 +-
docs/en-US/plugin-niciranvp-preparations.xml | 4 +-
docs/en-US/plugin-niciranvp-ui.xml | 26 +
docs/en-US/plugin-niciranvp-usage.xml | 1 +
docs/en-US/sys-offering-sysvm.xml | 75 +
plugins/api/discovery/pom.xml | 64 +-
.../api/response/ApiDiscoveryResponse.java | 16 +
.../discovery/ApiDiscoveryServiceImpl.java | 14 +-
.../cloudstack/discovery/ApiDiscoveryTest.java | 87 +
.../hypervisor/kvm/resource/BridgeVifDriver.java | 7 +-
.../kvm/resource/LibvirtComputingResource.java | 115 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 37 +
.../hypervisor/kvm/resource/OvsVifDriver.java | 189 ++
.../kvm/storage/KVMStoragePoolManager.java | 4 +
server/pom.xml | 1 +
server/src/com/cloud/api/ApiDBUtils.java | 14 +
server/src/com/cloud/api/ApiDispatcher.java | 19 +-
server/src/com/cloud/api/ApiResponseHelper.java | 94 +-
server/src/com/cloud/api/ApiServer.java | 2 +
server/src/com/cloud/api/doc/ApiXmlDocWriter.java | 20 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 140 ++-
.../com/cloud/api/query/ViewResponseHelper.java | 10 +
.../com/cloud/api/query/dao/DataCenterJoinDao.java | 30 +
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 109 +
.../com/cloud/api/query/vo/DataCenterJoinVO.java | 284 +++
.../configuration/DefaultComponentLibrary.java | 2 +
server/src/com/cloud/dao/EntityManagerImpl.java | 7 +
.../src/com/cloud/network/NetworkServiceImpl.java | 24 -
.../com/cloud/resource/ResourceManagerImpl.java | 5 +-
.../src/com/cloud/server/ManagementServerImpl.java | 112 -
.../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 | 1891 ++++++++-------
setup/db/db/schema-40to410.sql | 48 +-
tools/cli/cloudmonkey/cloudmonkey.py | 42 +-
tools/cli/cloudmonkey/common.py | 4 +-
tools/cli/setup.py | 2 +-
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 | 4 +
ui/scripts/accounts.js | 8 +-
ui/scripts/instanceWizard.js | 33 +-
ui/scripts/projects.js | 2 +-
ui/scripts/system.js | 6 +
ui/scripts/ui-custom/instanceWizard.js | 10 +
utils/src/com/cloud/utils/IteratorUtil.java | 10 +
utils/src/com/cloud/utils/ReflectUtil.java | 48 +-
utils/src/com/cloud/utils/db/GenericDao.java | 3 +
utils/src/com/cloud/utils/db/GenericDaoBase.java | 8 +
utils/src/com/cloud/utils/script/Script.java | 90 +-
75 files changed, 2894 insertions(+), 1261 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c6ae19d1/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c6ae19d1/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c6ae19d1/server/src/com/cloud/configuration/DefaultComponentLibrary.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c6ae19d1/utils/src/com/cloud/utils/db/GenericDao.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c6ae19d1/utils/src/com/cloud/utils/db/GenericDaoBase.java
----------------------------------------------------------------------