Sheng Yang 94c62f2127 CS-15513: Fix group 5 of s2s vpn ... Conflicts: utils/test/com/cloud/utils/net/NetUtilsTest.java		2012-07-10 10:38:17 -07:00
..
com/cloud/utils	CS-15513: Fix group 5 of s2s vpn	2012-07-10 10:38:17 -07:00
resources	bug 11531: while taking snapshot on volume, if volume is attached to a VM instance and under VMware, check if there are other ongoing snapshot tasks for the VM instance.	2011-09-22 16:22:12 -07:00