Murali Reddy 982c5fffbf CLOUDSTACK-5228: [API] [EIP/ELB enabled Zone] Need to display EIP address as ... "Public IP Address" for system VMs In system VM response object return EIP as public IP in case of basic zone with EIP service. Conflicts: server/src/com/cloud/api/ApiResponseHelper.java		2013-11-21 15:29:17 +05:30
..
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	CLOUDSTACK-5228: [API] [EIP/ELB enabled Zone] Need to display EIP address as	2013-11-21 15:29:17 +05:30
test	CLOUDSTACK-4649:	2013-10-21 16:10:07 -07:00
pom.xml	Revert "Updating pom.xml version numbers for release 4.2.1"	2013-11-12 21:17:27 +05:30