cloudstack/server/src/com/cloud/user
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
..
dao bug 9620: fixed updateUser api to make updates only for the fields that are specified in the request 2011-07-19 11:10:52 -07:00
AccountManager.java bug 9419: implement api to reset resource count 2011-06-16 18:59:38 +05:30
AccountManagerImpl.java Revert "bug 10435: removed vpn feature" 2011-08-02 18:12:57 -07:00