From af3560546c5beda1f35ea738500753fc3be071c2 Mon Sep 17 00:00:00 2001 From: Adam Lowe Date: Tue, 6 Mar 2012 16:33:16 +0000 Subject: [PATCH] Merging with upstream --- .../vcloud/director/v1_5/domain/Owner.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java index 6af3bb8e6c..2b8741af9c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java @@ -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 { -<<<<<<< HEAD -{ -======= ->>>>>>> VCloud Director 1.5: Adding VAppTemplateClient error handling tests and fixing bug in NetworkService.isEnabled public static Builder builder() { return new Builder(); }