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
..
conf	Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format	2013-07-26 20:35:49 -07:00
resources/com/cloud/upgrade	CLOUDSTACK-1818: add a missing file that is missed in previous patch	2013-03-29 11:12:36 -07:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group	2013-09-03 20:02:38 -07:00
test	CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group	2013-09-03 20:02:44 -07:00
pom.xml	Revert "Reverting the range of commits that broke the build"	2013-08-08 15:02:40 -07:00