cloudstack/server
Sheng Yang d90be0d9bc S2S VPN: CS-15748: Deleting customer vpn gateway when delete account
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-07-30 15:34:41 -07:00
..
conf fixing line endings in server 2012-04-07 20:13:10 -04:00
scripts Source code committed 2010-08-11 09:13:29 -07:00
src/com/cloud S2S VPN: CS-15748: Deleting customer vpn gateway when delete account 2012-07-30 15:34:41 -07:00
test VPC: added vif info to ipassoc command 2012-07-27 13:53:41 -07:00
.classpath bug 6745: Using UUID instead of integers - for System VM s 2011-11-03 07:33:57 -07:00
.project Fix corrupted eclipse project settings, schema fixes and updated template download url 2010-09-29 18:41:54 -07:00