cloudstack/server
Murali Reddy 899e9f0d60 CS-16962: [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:20:28 +05:30
..
conf Summary: Updated sudoers approved commands for cloud user 2013-10-23 13:42:16 -07:00
resources Make com.cloud.network.vpn.RemoteAccessVpnService an extensible type 2013-11-14 15:31:33 -08:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src CS-16962: [API] [EIP/ELB enabled Zone] Need to display EIP address as 2013-11-21 15:20:28 +05:30
test CLOUDSTACK-4835: Update global configuration test cases failed in master Changes made in update/list configuration API to use ConfigDepot 2013-11-15 12:19:31 +05:30
pom.xml Get rid of some errors and warnings in the server and usage sources 2013-11-04 20:01:14 +01:00