Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merging with upstream

This commit is contained in:
Adam Lowe 2012-03-06 16:33:16 +00:00
parent 15bcec0163
commit af3560546c
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
View File

@ -19,18 +19,17 @@
package org.jclouds.vcloud.director.v1_5.domain;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
import java.util.Set;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import java.net.URI;
import java.util.Set;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Preconditions.checkNotNull;
/**
@ -58,10 +57,6 @@ import com.google.common.collect.Sets;
@XmlType(propOrder = {"user"})
public class Owner extends ResourceType<Owner> {
<<<<<<< HEAD
{
=======
>>>>>>> VCloud Director 1.5: Adding VAppTemplateClient error handling tests and fixing bug in NetworkService.isEnabled
public static Builder builder() {
return new Builder();
}