mirror of https://github.com/apache/cloudstack.git
4722fa3de9
Conflicts: client/WEB-INF/classes/resources/messages_ja_JP.properties client/WEB-INF/classes/resources/messages_zh_CN.properties engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java plugins/event-bus/rabbitmq/pom.xml plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/storage/VolumeApiServiceImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java setup/db/db/schema-442to450.sql test/integration/component/test_persistent_networks.py This closes #53 |
||
|---|---|---|
| .. | ||
| WEB-INF | ||
| bindir | ||
| distro | ||
| resources/META-INF/cloudstack | ||
| tomcatconf | ||
| pom.xml | ||