cloudstack/scripts/vm/hypervisor/xenserver
Alena Prokharchyk 353423acec Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
2012-07-06 12:04:10 -07:00
..
xcposs add console proxy support for devcloud 2012-07-03 23:38:39 -07:00
xcpserver Merge branch 'master' into vpc 2012-07-06 12:04:10 -07:00
xenserver56 Merge branch 'master' into vpc 2012-06-28 17:41:40 -07:00
xenserver56fp1 Merge branch 'master' into vpc 2012-06-28 17:41:40 -07:00
xenserver60 Merge branch 'master' into vpc 2012-06-28 17:41:40 -07:00
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 license header changes for scripts folder from Chip Childers 2012-06-23 00:58:00 -04: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
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
network_info.sh license header changes for scripts folder from Chip Childers 2012-06-23 00:58:00 -04: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
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 license header changes for scripts folder from Chip Childers 2012-06-23 00:58:00 -04: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
vhd-util bug 6772: use vhd-util to coalesce snapshots into primary storage 2011-03-07 19:47:29 -08:00
vmops Merge branch 'master' into vpc 2012-06-28 17:41:40 -07:00
vmopsSnapshot license header changes for scripts folder from Chip Childers 2012-06-23 00:58:00 -04:00
vmopspremium license header changes for scripts folder from Chip Childers 2012-06-23 00:58:00 -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 license header changes for scripts folder from Chip Childers 2012-06-23 00:58:00 -04:00
xs_cleanup.sh license header changes for scripts folder from Chip Childers 2012-06-23 00:58:00 -04:00