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

..

resources/META-INF/cloudstack/api-planner

Add missing licenses

2013-10-23 15:20:08 -07:00

src

Resource metadata support for S2SVpnConnection

2013-12-12 16:39:02 -08:00

test

All Checkstyle problems corrected

2013-12-12 12:26:07 -08:00

pom.xml

Bump 4.3.0 to 4.4.0 in master

2013-11-21 16:01:15 +01:00