Sheng Yang 2df1d7f328 Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm" ... This reverts commit f99d599930. Due to it break vpc function and block regression test. Conflicts: server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java server/test/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImplTest.java		2013-07-21 22:23:48 -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
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