Alena Prokharchyk 6420ecbd6f Merge branch 'master' into vpc ...

Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java

2012-07-24 16:13:06 -07:00

..

ovm

License header updates for the ovm folder from Chip Childers

2012-07-02 09:52:55 -04:00

vmware

Merge branch 'master' into vpc

2012-07-24 16:13:06 -07:00

xen

CS-15511: Fix parameter transfer in bash

2012-07-23 14:51:40 -07:00