Alena Prokharchyk cb14dad75b Resource metadata - support for VPC ... Conflicts: api/src/com/cloud/server/ResourceTag.java server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java		2013-11-21 12:59:49 -08:00
..
api	CLOUDSTACK-669: side-by-side VM sync management at manager level	2013-11-20 18:22:38 -08:00
components-api	CLOUDSTACK-669: side-by-side VM sync management at manager level	2013-11-20 18:22:38 -08:00
network	Updating pom.xml version numbers for release 4.3.0-SNAPSHOT	2013-08-01 10:35:00 -04:00
orchestration	CLOUDSTACK-669: side-by-side VM sync management at manager level	2013-11-20 18:22:38 -08:00
schema	Resource metadata - support for VPC	2013-11-21 12:59:49 -08:00
service	Fix a few xml wellformedness issues	2013-09-21 14:58:56 +08:00
storage	CS-18582: if EIP is used, extract volume and template returns wrong public ip address. If remote agent is ssvm agent, then looking up public ip address from ssvm table	2013-11-20 16:31:33 -08:00
pom.xml	the cloud-engine-storage-integration-test sub-project should not depend	2013-09-02 14:32:25 +02:00