Alena Prokharchyk 982562b9fb VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip) ... Conflicts: server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java		2012-06-15 14:31:58 -07:00
..
com/cloud	VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip)	2012-06-15 14:31:58 -07:00
resources	Switch to Apache license	2012-04-03 04:50:05 -07:00
async-job-component.xml	fixing line endings in server	2012-04-07 20:13:10 -04:00
sync-queue-component.xml	fixing line endings in server	2012-04-07 20:13:10 -04:00