alena 8d47c53735 Revert "bug 10435: removed vpn feature" ...

This reverts commit ea9e1b5d138950e8de49fce7ffdbb12a1c72c560.

Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java

2011-08-02 18:12:57 -07:00

..

xcpserver

bug 9651: Make same VLAN work on two different nics

2011-06-01 17:07:44 -07:00

xenserver56

Revert "bug 10435: removed vpn feature"

2011-08-02 18:12:57 -07:00

xenserver56fp1

Revert "bug 10435: removed vpn feature"

2011-08-02 18:12:57 -07:00

check_heartbeat.sh

add VERSION into to scripts

2011-03-23 14:54:31 -07:00

cloud-clean-vlan.sh

bug 10197: add some scripts which is used in upgrade

2011-07-26 16:22:54 -07:00

cloud-prepare-upgrade.sh

fixed cloud-prepare-upgrade.sh

2011-07-28 15:03:39 -07:00

cloud-setup-bonding.sh

add VERSION into to scripts

2011-03-23 14:54:31 -07:00

copy_vhd_from_secondarystorage.sh

use rmdir

2011-08-01 11:48:56 -07:00

copy_vhd_to_secondarystorage.sh

use rmdir

2011-08-01 11:48:56 -07:00

create_privatetemplate_from_snapshot.sh

use rmdir

2011-08-01 11:48:56 -07:00

fsimage.so

merge premium xenserver scripts to oss

2011-01-28 17:42:27 -08:00

hostvmstats.py

add VERSION into to scripts

2011-03-23 14:54:31 -07:00

launch_hb.sh

add VERSION into to scripts

2011-03-23 14:54:31 -07:00

make_migratable.sh

add VERSION into to scripts

2011-03-23 14:54:31 -07:00

network_info.sh

add VERSION into to scripts

2011-03-23 14:54:31 -07:00

ovsgre

add VERSION into to scripts

2011-03-23 14:54:31 -07:00

ovstunnel

add VERSION into to scripts

2011-03-23 14:54:31 -07:00

setup_heartbeat_file.sh

add VERSION into to scripts

2011-03-23 14:54:31 -07:00

setup_heartbeat_sr.sh

add VERSION into to scripts

2011-03-23 14:54:31 -07:00

setup_iscsi.sh

add VERSION into to scripts

2011-03-23 14:54:31 -07:00

setupxenserver.sh

bug 10081: don't save iptable

2011-06-06 18:19:01 -07:00

swift

swift integration checkin

2011-05-05 13:55:29 -07:00

upgrade_snapshot.sh

use rmdir

2011-08-01 11:48:56 -07:00

vhd-util

bug 6772: use vhd-util to coalesce snapshots into primary storage

2011-03-07 19:47:29 -08:00

vmops

Revert "bug 10435: removed vpn feature"

2011-08-02 18:12:57 -07:00

vmopspremium

add VERSION into to scripts

2011-03-23 14:54:31 -07:00

vmopsSnapshot

use the safe way to delete secondary storage directory

2011-07-22 19:35:46 -07:00

xenheartbeat.sh

merge premium xenserver scripts to oss

2011-01-28 17:42:27 -08:00

xs_cleanup.sh

add VERSION into to scripts

2011-03-23 14:54:31 -07:00