You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2015/04/07 23:33:25 UTC
[27/32] jclouds git commit: Revert "JCLOUDS-653: Address Guava 18
deprecations"
Revert "JCLOUDS-653: Address Guava 18 deprecations"
This reverts commit 65e1def4bdc1d763f505a8316dd6eb78f26300a8.
Many conflicts due to many changes between above commit and now.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/691144ca
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/691144ca
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/691144ca
Branch: refs/heads/master
Commit: 691144caa9cdf41847d8d928aa4d5dbf9842430e
Parents: a12c168
Author: Adrian Cole <ad...@gmail.com>
Authored: Thu Oct 23 20:21:23 2014 -0700
Committer: Adrian Cole <ac...@twitter.com>
Committed: Fri Oct 24 11:27:49 2014 -0700
----------------------------------------------------------------------
.../org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/691144ca/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java
index 9a80b10..d987f88 100644
--- a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java
+++ b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.rackspace.cloudfiles.v1.domain;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
@@ -24,8 +24,8 @@ import java.net.URI;
import javax.inject.Named;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents a CDN Container in Rackspace Cloud Files.