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 |