cloudstack/server/test/resources
Prachi Damle ca1a7948f1 Merge branch 'master' into affinity_groups
Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/componentContext.xml.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-04-05 13:49:20 -07:00
..
CloneSettingDaoTestContext.xml Update unit test configuraitons to new custom Spring AOP 2013-03-29 11:12:36 -07:00
SecurityGroupManagerTestContext.xml Update unit test configuraitons to new custom Spring AOP 2013-03-29 11:12:36 -07:00
SnapshotDaoTestContext.xml Update unit test configuraitons to new custom Spring AOP 2013-03-29 11:12:36 -07:00
StoragePoolDaoTestContext.xml Update unit test configuraitons to new custom Spring AOP 2013-03-29 11:12:36 -07:00
VpcApiUnitTestContext.xml Update unit test configuraitons to new custom Spring AOP 2013-03-29 11:12:36 -07:00
VpcTestContext.xml Update unit test configuraitons to new custom Spring AOP 2013-03-29 11:12:36 -07:00
affinityContext.xml Merge branch 'master' into affinity_groups 2013-04-05 13:49:20 -07:00
cleanup.sql Patch from Gavin Lee: Change license to ASL2.0 in server and tools 2012-08-30 10:36:29 -04:00
createNetworkOffering.xml Update unit test configuraitons to new custom Spring AOP 2013-03-29 11:12:36 -07:00
db.properties added missing files 2013-01-17 06:50:59 -08:00
fake.sql Patch from Gavin Lee: Change license to ASL2.0 in server and tools 2012-08-30 10:36:29 -04:00
network-mgr-component.xml Network-refactor: fix bugs in components.xml discovered by unit tests 2013-01-09 15:49:02 -08:00
testContext.xml Update unit test configuraitons to new custom Spring AOP 2013-03-29 11:12:36 -07:00