cloudstack/api/src/com/cloud/network/vpc
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
..
PrivateGateway.java Removed @author tag from bunch of resources 2012-07-06 17:25:36 -07:00
PrivateIp.java Removed @author tag from bunch of resources 2012-07-06 17:25:36 -07:00
StaticRoute.java Removed @author tag from bunch of resources 2012-07-06 17:25:36 -07:00
StaticRouteProfile.java Removed @author tag from bunch of resources 2012-07-06 17:25:36 -07:00
Vpc.java Removed @author tag from bunch of resources 2012-07-06 17:25:36 -07:00
VpcGateway.java Removed @author tag from bunch of resources 2012-07-06 17:25:36 -07:00
VpcOffering.java Removed @author tag from bunch of resources 2012-07-06 17:25:36 -07:00
VpcService.java 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