media type

Conflicts:

	labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorMediaType.java
This commit is contained in:
danikov 2012-02-15 00:58:39 +00:00
parent f3543a4c23
commit 1972886598
1 changed files with 2 additions and 0 deletions

View File

@ -63,6 +63,8 @@ public class VCloudDirectorMediaType {
public static final String PROPERTY = "application/vnd.vmware.vcloud.property+xml"; public static final String PROPERTY = "application/vnd.vmware.vcloud.property+xml";
public static final String MEDIA_XML = "application/vnd.vmware.vcloud.media+xml";
public static final List<String> ALL = Arrays.asList( public static final List<String> ALL = Arrays.asList(
SESSION, ERROR, ORG_LIST, METADATA, METADATA_ENTRY, SESSION, ERROR, ORG_LIST, METADATA, METADATA_ENTRY,
METADATA_VALUE, ORG, TASKS_LIST, TASK, ORG_NETWORK, METADATA_VALUE, ORG, TASKS_LIST, TASK, ORG_NETWORK,