mirror of https://github.com/apache/cloudstack.git
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 |
||
|---|---|---|
| .. | ||
| ResourceLimitManagerImpl.java | ||