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

..

bindir

catch exception if mysqld has not been started when

2010-12-16 15:29:06 -08:00

db

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

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

.project

Branch 2.1.refactor committed

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