cloudstack/core
alena 012f097885 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
Conflicts:
	core/src/com/cloud/server/ManagementServer.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2010-09-14 19:57:26 -07:00
..
src/com/cloud Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-09-14 19:57:26 -07:00
test/com/cloud Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-23 12:12:45 -07:00
.classpath Update eclipse project classpath file to work with renamed vmware jar files 2010-08-23 14:16:43 -07:00
.project Source code committed 2010-08-11 09:13:29 -07:00