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
..
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
UserVMDaoTestContext.xml	CLOUDSTACK-1086: DeployVirtualMachine userdata enhancements	2013-04-24 13:42:38 +05:30
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	Fixed up unit testing to use only an in class TestConfiguration	2013-05-06 16:34:27 -07:00
appLoadBalancer.xml	CLOUDSTACK-747: Internal LB between VPC tiers support	2013-05-09 11:54:41 -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	CLOUDSTACK-702: Multiple ip ranges in different subnets.	2013-05-13 17:06:44 +05:30
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	Fixed typos	2013-04-13 13:28:32 +00:00
testContext.xml	Update unit test configuraitons to new custom Spring AOP	2013-03-29 11:12:36 -07:00