cloudstack/server/test
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
..
com/cloud Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm" 2013-07-21 22:23:48 -07:00
org/apache/cloudstack Cloudstack-2997 Make haproxy maxconn configurable 2013-07-17 10:06:11 +05:30
resources Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm" 2013-07-21 22:23:48 -07:00
async-job-component.xml CLOUDSTACK-1192: Add Disk I/O Statistics 2013-06-01 08:00:48 +02:00
sync-queue-component.xml License header updates for the server folder. 2012-08-03 09:41:27 -04:00