Sheng Yang 8b9b2d0f1a Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss ...

Conflicts:
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql

2011-11-10 16:40:54 -08:00

..

conf

Removed bad word from log4j config files.

2011-02-08 13:55:40 -08: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

2011-11-10 16:40:54 -08:00

test

Merge complete except for virtualnetworkappliancemanager

2011-11-10 15:18:16 -08:00

.classpath

bug 6745: Using UUID instead of integers - for System VM s

2011-11-03 07:33:57 -07:00

.project

Fix corrupted eclipse project settings, schema fixes and updated template download url

2010-09-29 18:41:54 -07:00