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
..
dao	Switch to Apache license	2012-04-03 04:50:05 -07:00
MockUserVmManagerImpl.java	bug 14615: deployVm can work 2 diff ways now: 1) Default way - create and start the vm. 2) Create the vm without starting it. Note that vm's volumes stay in Allocated state -not created on the backend till the point where vm starts	2012-04-06 11:30:48 -07:00
MockVirtualMachineManagerImpl.java	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