cloudstack/api/src/com/cloud/vm
Alena Prokharchyk d31449f1c0 Name change for vpc/Dao package (dao is lowercased now)
Conflicts:

	api/src/com/cloud/vm/PluggableNics.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/dao/PrivateIpDao.java
	server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java
	server/src/com/cloud/network/vpc/dao/StaticRouteDao.java
	server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java
	server/src/com/cloud/network/vpc/dao/VpcDao.java
	server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java
	server/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
	server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
	server/src/com/cloud/network/vpc/dao/VpcOfferingDao.java
	server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java
	server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDao.java
	server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
2012-08-08 15:02:46 -07:00
..
BareMetalVmService.java Switch to Apache license 2012-04-03 04:54:14 -07:00
DiskProfile.java Switch to Apache license 2012-04-03 04:54:14 -07:00
InstanceGroup.java Switch to Apache license 2012-04-03 04:54:14 -07:00
Nic.java Plug nic support 2012-05-23 16:18:41 -07:00
NicProfile.java VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones 2012-07-23 16:18:49 -07:00
ReservationContext.java Switch to Apache license 2012-04-03 04:54:14 -07:00
RunningOn.java Switch to Apache license 2012-04-03 04:54:14 -07:00
UserVmService.java Plug nic support 2012-05-23 16:18:41 -07:00
VirtualMachine.java 1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support 2012-05-22 16:53:27 -07:00
VirtualMachineProfile.java Removed network_id reference from domain_router table as now VirtualRouter can be associated with multiple networks (VPC case). Code modifications were done accordingly to the places where this field was used. 2012-05-18 17:25:04 -07:00
VmStats.java Switch to Apache license 2012-04-03 04:54:14 -07:00