Prachi Damle fb18223933 Merge branch 'master' into planner_reserve ... Conflicts: api/src/com/cloud/event/EventTypes.java server/src/com/cloud/capacity/CapacityManagerImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java server/test/resources/affinityContext.xml setup/db/db/schema-410to420.sql		2013-05-08 17:02:35 -07:00
..
baremetal	Planner choice in ServiceOffering and Planners using the ServiceOffering in canHandle()	2013-05-04 22:53:30 -07:00
kvm	CLOUDSTACK-1828 Source Nat on private gateway feature	2013-05-02 15:40:15 +05:30
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	Fixing build breakage.	2013-05-02 17:10:21 +05:30
xen	CLOUDSTACK-1907: Debian Squeeze 6.0 (64-bit) is not experimental any more	2013-05-08 19:54:54 +01:00