Alena Prokharchyk d9e1c9c502 CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately ... Conflicts: server/src/com/cloud/network/NetworkModelImpl.java server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java		2014-03-14 11:57:58 -07:00
..
com/cloud	CLOUDSTACK-6205: VPC VR start - skip private gateway when create Guest nics as the nic for the private gateway is being created separately	2014-03-14 11:57:58 -07:00
org/apache/cloudstack	Merge branch 'master' into rbac.	2014-03-06 14:02:20 -08:00
resources	CLOUDSTACK-4760 : Enabling GPU support for XenServer.	2014-03-11 15:44:51 +05:30
async-job-component.xml	All Checkstyle problems corrected	2013-12-12 12:26:07 -08:00
sync-queue-component.xml	License header updates for the server folder.	2012-08-03 09:41:27 -04:00