Sateesh Chodapuneedi 53d4c8f532 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x ... Conflicts: server/src/com/cloud/resource/ResourceManagerImpl.java		2012-05-23 16:30:52 +05:30
..
src/com/cloud	Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x	2012-05-23 16:30:52 +05:30
.classpath	Use exports for jar dependecy	2011-02-01 11:10:37 -08:00
.project	Source code committed	2010-08-11 09:13:29 -07:00