Alena Prokharchyk 21519070fc VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to ... Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/vpc/VpcManager.java server/src/com/cloud/vm/VirtualMachineManagerImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java		2012-07-09 18:23:35 -07:00
..
apidoc	Merge branch 'master' into vpc	2012-06-28 17:44:08 -07:00
bindir	applying the commits from Chip Childers licensing cleanup	2012-06-26 10:44:04 -04:00
db	VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to	2012-07-09 18:23:35 -07:00
.project	Branch 2.1.refactor committed	2010-08-11 09:13:42 -07:00