Jessica Wang 98bc240d2a Revert "Dedicate Public IP range" ... This reverts commit d6ed8d7cb5. Conflicts: server/test/com/cloud/configuration/ConfigurationManagerTest.java		2013-04-08 17:15:51 -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 "Dedicate Public IP range"	2013-04-08 17:15:51 -07:00
test	Revert "Dedicate Public IP range"	2013-04-08 17:15:51 -07:00
pom.xml	Disabling broken test, see CLOUDSTACK-1884. Please revert this commit once the test itself is fixed.	2013-04-02 10:02:57 +02:00