mirror of https://github.com/apache/cloudstack.git
634cd78baa
Conflicts: api/src/com/cloud/api/ApiConstants.java api/src/com/cloud/api/BaseCmd.java api/src/com/cloud/api/ResponseGenerator.java api/src/com/cloud/api/commands/ListNetworksCmd.java api/src/com/cloud/api/response/NetworkResponse.java api/src/com/cloud/event/EventTypes.java api/src/com/cloud/network/NetworkService.java client/tomcatconf/commands.properties.in scripts/network/domr/getDomRVersion.sh scripts/network/domr/ipassoc.sh scripts/network/domr/l2tp_vpn.sh scripts/network/domr/networkUsage.sh scripts/network/domr/router_proxy.sh server/src/com/cloud/api/ApiDBUtils.java server/src/com/cloud/api/ApiResponseHelper.java server/src/com/cloud/configuration/DefaultComponentLibrary.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/dao/IPAddressDao.java server/src/com/cloud/network/dao/IPAddressDaoImpl.java setup/apidoc/gen_toc.py setup/db/create-schema.sql wscript |
||
|---|---|---|
| .. | ||
| db | ||
| 22beta4to22GA.sql | ||
| 221to222upgrade.sh | ||
| create-database-premium.sql | ||
| create-database.sql | ||
| create-index-fk.sql | ||
| create-schema-premium.sql | ||
| create-schema-simulator.sql | ||
| create-schema.sql | ||
| data-20to21.sql | ||
| data-22beta1to22beta2.sql | ||
| deploy-db-dev.sh | ||
| deploy-db-simulator.sh | ||
| index-20to21.sql | ||
| index-212to213.sql | ||
| postprocess-20to21.sql | ||
| server-setup.sql | ||
| server-setup.xml | ||
| templates.kvm.sql | ||
| templates.simulator.sql | ||
| templates.sql | ||
| templates.vmware.sql | ||
| templates.xenserver.sql | ||