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

..

InterfaceReconfigure.py

merge premium xenserver scripts to oss

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

nfs.py

Source code committed

2010-08-11 09:13:29 -07:00

NFSSR.py

fixed mount issue

2010-12-17 20:07:09 -08:00

patch

Revert "bug 10435: removed vpn feature"

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