Sheng Yang 2d2c0c48cd Merge branch 'pvlan' ...

Conflicts:
	scripts/vm/hypervisor/xenserver/xenserver60/patch
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java

2013-05-15 16:08:08 -07:00

..

xcposs

Multiple Secondary Storage Issue

2013-03-14 21:08:27 -04:00

xcpserver

CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host

2013-05-15 16:17:21 +05:30

xenserver56

CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host

2013-05-15 16:17:21 +05:30

xenserver56fp1

CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host

2013-05-15 16:17:21 +05:30

xenserver60

Merge branch 'pvlan'

2013-05-15 16:08:08 -07:00

add_to_vcpus_params_live.sh

CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host

2013-05-15 16:17:21 +05:30

check_heartbeat.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

cloud-clean-vlan.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

cloud-prepare-upgrade.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

cloud-propagate-vlan.sh

Summary: several scripts are not mode executable

2013-01-17 11:21:42 -07:00

cloud-setup-bonding.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

cloudstack_pluginlib.py

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

cloudstack_plugins.conf

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

copy_vhd_from_secondarystorage.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

copy_vhd_to_secondarystorage.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

create_privatetemplate_from_snapshot.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

createipAlias.sh

CLOUDSTACK-702: Multiple ip ranges in different subnets.

2013-05-13 17:06:44 +05:30

deleteipAlias.sh

CLOUDSTACK-702: Multiple ip ranges in different subnets.

2013-05-13 17:06:44 +05:30

hostvmstats.py

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

kill_copy_process.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

launch_hb.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

make_migratable.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

mockxcpplugin.py

finaly, finish download template to primary storage

2012-12-20 19:06:02 -08:00

network_info.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

ovs-get-bridge.sh

PVLAN: Add network label parameter to PvlanSetupCommand

2013-05-01 13:23:09 -07:00

ovs-get-dhcp-iface.sh

PVLAN: PvlanSetupCommand for KVM support

2013-05-01 13:23:09 -07:00

ovs-pvlan

PVLAN: PvlanSetupCommand for KVM support

2013-05-01 13:23:09 -07:00

ovs-vif-flows.py

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

ovstunnel

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

s3xen

Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones.

2012-12-13 23:18:37 -08:00

setup_heartbeat_file.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

setup_heartbeat_sr.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

setup_iscsi.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

setupxenserver.sh

Disable IPv6 in XenServer if it is enabled. The cloud support pack apparently enables IPv6 support at the moment, but wihtout proper security.

2012-07-30 17:36:29 +02:00

storagePlugin

refactor test cases: use testNG instead of junit, as testNG can group test cases and pass parameter to test case

2012-12-22 22:10:39 -08:00

swift

swift is written in python 2.6

2011-10-13 12:07:09 -07:00

swiftxen

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

upgrade_snapshot.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

upgrade_vnc_config.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

vmops

CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host

2013-05-15 16:17:21 +05:30

vmopspremium

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

vmopsSnapshot

Multiple Secondary Storage Issue

2013-03-14 21:08:27 -04:00

xen-ovs-vif-flows.rules

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00

xenheartbeat.sh

Review 9647: In some storage failure scenario’s the NFS timeout can

2013-03-05 15:38:54 +01:00

xs_cleanup.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00