cloudstack/server/test/resources
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
SecurityGroupManagerTestContext.xml
SnapshotDaoTestContext.xml
StoragePoolDaoTestContext.xml
UserVMDaoTestContext.xml
VpcApiUnitTestContext.xml
VpcTestContext.xml
appLoadBalancer.xml
cleanup.sql
createNetworkOffering.xml
db.properties
fake.sql
network-mgr-component.xml
testContext.xml