Anthony Xu 19a1116df2 Merge branch '4-2-advanced-zone-security-group'		2013-05-28 11:03:56 -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	Merge branch '4-2-advanced-zone-security-group'	2013-05-28 11:03:56 -07:00
test	CLOUDSTACK-2700:on network/vpc delete, portable IP should be still	2013-05-27 18:44:41 +05:30
pom.xml	CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering	2013-05-16 15:02:17 -07:00