cloudstack/api/src
Alena Prokharchyk 9df10718e4 Resource metadata support for S2SVpnConnection
Conflicts:
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
	setup/db/db/schema-421to430.sql
2013-12-12 16:39:02 -08:00
..
com/cloud Resource metadata support for S2SVpnConnection 2013-12-12 16:39:02 -08:00
org/apache/cloudstack pull merges 2013-12-12 13:00:26 -08:00