mirror of https://github.com/apache/cloudstack.git
aaf0d24a83
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/AssociateIPAddrCmd.java api/src/com/cloud/api/commands/EnableStaticNatCmd.java api/src/com/cloud/event/EventTypes.java api/src/com/cloud/network/NetworkService.java api/src/com/cloud/network/rules/RulesService.java client/tomcatconf/commands.properties.in core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java scripts/vm/hypervisor/xenserver/xenserver56fp1/patch 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/consoleproxy/ConsoleProxyManagerImpl.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/network/rules/RulesManagerImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java server/src/com/cloud/upgrade/dao/Upgrade2214to30.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java setup/db/create-schema.sql wscript |
||
|---|---|---|
| .. | ||
| xcpserver | ||
| xenserver56 | ||
| xenserver56fp1 | ||
| xenserver60 | ||
| check_heartbeat.sh | ||
| cloud-clean-vlan.sh | ||
| cloud-prepare-upgrade.sh | ||
| cloud-propagate-vlan.sh | ||
| cloud-setup-bonding.sh | ||
| cloudstack_pluginlib.py | ||
| cloudstack_plugins.conf | ||
| copy_vhd_from_secondarystorage.sh | ||
| copy_vhd_to_secondarystorage.sh | ||
| create_privatetemplate_from_snapshot.sh | ||
| hostvmstats.py | ||
| kill_copy_process.sh | ||
| launch_hb.sh | ||
| make_migratable.sh | ||
| network_info.sh | ||
| ovs-vif-flows.py | ||
| ovstunnel | ||
| setup_heartbeat_file.sh | ||
| setup_heartbeat_sr.sh | ||
| setup_iscsi.sh | ||
| setupxenserver.sh | ||
| swift | ||
| swiftxen | ||
| upgrade_snapshot.sh | ||
| upgrade_vnc_config.sh | ||
| vhd-util | ||
| vmops | ||
| vmopsSnapshot | ||
| vmopspremium | ||
| xen-ovs-vif-flows.rules | ||
| xenheartbeat.sh | ||
| xs_cleanup.sh | ||