Prachi Damle ed8ff40f7f Merge branch 'master' into planner_reserve ... Conflicts: api/src/org/apache/cloudstack/api/ApiConstants.java engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java server/src/com/cloud/configuration/ConfigurationManagerImpl.java server/src/com/cloud/server/ManagementServerImpl.java setup/db/db/schema-410to420.sql		2013-05-15 14:44:56 -07:00
..
baremetal	Merge branch 'master' into planner_reserve	2013-05-15 14:44:56 -07:00
kvm	Summary: Use hypervisor as clock source for system vms	2013-05-15 10:36:22 -06:00
ovm	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
simulator	Fixed up the simulator to run with windows paths in cygwin	2013-05-06 16:34:41 -07:00
ucs	Removing ^M's from code.	2013-04-04 00:53:20 +05:30
vmware	CLOUDSTACK-768: ACL on private gateway	2013-05-13 19:24:23 +05:30
xen	CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host	2013-05-15 16:17:21 +05:30