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

..

conf

Source code committed

2010-08-11 09:13:29 -07:00

scripts

Source code committed

2010-08-11 09:13:29 -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

more file changes

2010-09-09 13:27:20 -07:00

.classpath

"Add host" for kvm:

2010-08-13 23:19:36 -07:00

.project

Source code committed

2010-08-11 09:13:29 -07:00

wscript_build

Split out build responsibility into per-project wscript_build files. Installation of generic directories like bindir, and creation of systemvms, remain in toplevel wscript_build. Make some waf code useful and reusable in the form of tools.

2010-08-31 20:40:17 -07:00