Ragnar B. Johannsson 83b3580c32 Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss ... Conflicts: client/tomcatconf/commands.properties.in core/src/com/cloud/vm/UserVmVO.java server/src/com/cloud/configuration/DefaultComponentLibrary.java server/src/com/cloud/vm/UserVmManagerImpl.java		2011-01-12 17:06:08 +00:00
..
src/com/cloud	Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss	2011-01-12 17:06:08 +00:00
.classpath	Persist disk chain info when we detach a volume, check disk chain info when we attach a volume, this is required when snapshot operations are involved in vwmare	2010-12-03 18:59:23 -08:00
.project	revert un neccessary changes	2010-09-29 18:40:52 -07:00