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
..
conf	conf: Add a @ so @MSUSER@ is replaced by "cloud"	2013-04-03 16:54:00 +02:00
resources/com/cloud/upgrade	CLOUDSTACK-1818: add a missing file that is missed in previous patch	2013-03-29 11:12:36 -07:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm"	2013-07-21 22:23:48 -07:00
test	Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm"	2013-07-21 22:23:48 -07:00
pom.xml	Fixed build. Not sure why it didn't come up on my compile before the commit	2013-07-18 22:53:30 -07:00