cloudstack-mirror/server/src/com/cloud/api
Alena Prokharchyk b92d2336ad VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details:
http://wiki.cloudstack.org/display/RelOps/Inter-VLAN+Routing+functional+spec

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
2012-08-01 18:57:33 -07:00
..
commands moving out NetApp code to plugins/file-systems/netapp 2012-07-02 08:34:02 -07:00
doc Patch from Chip Childers 2012-07-02 09:51:21 -04:00
response Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ApiDBUtils.java cloudstack 3.0 API - listVpnConnections API - add gatewayIp, guestCidrList,ipsecPsk, ikePolicy, espPolicy, lifetime property (get it from customerGateway object). 2012-07-23 14:21:10 -07:00
ApiDispatcher.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ApiGsonHelper.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ApiResponseGsonHelper.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ApiResponseHelper.java VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details: 2012-08-01 18:57:33 -07:00
ApiSerializerHelper.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ApiServer.java Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
ApiServlet.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
EncodedStringTypeAdapter.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
IdentityTypeAdapter.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ResponseObjectTypeAdapter.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
SerializationContext.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
StringMapTypeAdapter.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00