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

..

conf

Implemented DB migration from 2.1.x to 2.2.x for Instance Grous feature. Added missing Daos to migration-components.xml (AccountDao, ResourceCoundDao, InstanceGroupDao, InstanceGroupVmMapDao).1

2010-09-21 18:53:18 -07:00

scripts

Source code committed

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

src/com/cloud

Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss

2011-01-12 17:06:08 +00:00

test

Bug 7409: Implement forcely-cancelling mechenism for jobs that have been staying in queue for too long

2011-01-05 15:44:10 -08:00

.classpath

Adding xenserver-5.6.0-1.jar to eclipse classpath and removing 5.5

2010-11-30 12:19:49 -08:00

.project

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

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