Prachi Damle 5628153c59 CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group ... Changes: - Adding mocks in unit tests for new injected components Conflicts: server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java		2013-09-03 20:02:44 -07:00
..
dao	merge master	2013-05-11 15:28:43 +05:30
snapshot	Revert "Reverting the range of commits that broke the build"	2013-08-08 15:02:40 -07:00
DeploymentPlanningManagerImplTest.java	CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group	2013-09-03 20:02:44 -07:00
UserVmManagerTest.java	CLOUDSTACK-4566: fix incorrect values in resource_count table for resource limitation	2013-09-02 16:56:34 +02:00