Alena Prokharchyk d35eb73c9b VPC: initial checkin for Static Routes ... Conflicts: api/src/com/cloud/api/ApiConstants.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java		2012-06-25 20:59:33 -07:00
..
conf	fixing line endings in server	2012-04-07 20:13:10 -04:00
scripts	…
src/com/cloud	VPC: initial checkin for Static Routes	2012-06-25 20:59:33 -07:00
test	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
.classpath	bug 6745: Using UUID instead of integers - for System VM s	2011-11-03 07:33:57 -07:00
.project	…