Murali Reddy a3b1a49c30 CLOUDSTACK-3911: [PortableIP] there is no check while adding a zone ... public range to see whether the same VLAN exists in portable IP range. added check to enusre a VLAN id used for a public IP range is not used for portable ip range Conflicts: server/src/com/cloud/configuration/ConfigurationManagerImpl.java		2013-10-18 17:34:03 +05:30
..
conf	Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format	2013-07-26 20:35:49 -07: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	CLOUDSTACK-3911: [PortableIP] there is no check while adding a zone	2013-10-18 17:34:03 +05:30
test	Remove Network Parameter for VPN service provider	2013-10-17 17:55:47 -07:00
pom.xml	Moved NetworkManagerImpl to NetworkOrchestrator	2013-09-06 15:40:32 -07:00