You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/06 19:09:40 UTC
git commit: Fix bad merge
Repository: jclouds-labs-openstack
Updated Branches:
refs/heads/1.8.x 47416116b -> c8451f913
Fix bad merge
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/c8451f91
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/c8451f91
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/c8451f91
Branch: refs/heads/1.8.x
Commit: c8451f91320d24f89295b6dd48034e5509f48e57
Parents: 4741611
Author: Adrian Cole <ac...@twitter.com>
Authored: Mon Oct 6 10:09:08 2014 -0700
Committer: Adrian Cole <ac...@twitter.com>
Committed: Mon Oct 6 10:09:08 2014 -0700
----------------------------------------------------------------------
.../blobstore/RegionScopedBlobStoreContext.java | 30 --------------------
1 file changed, 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/c8451f91/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java
index de1f50d..4393597 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java
@@ -123,36 +123,6 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC
return blobRequestSigner.apply(regionId);
}
-<<<<<<< HEAD
- /**
- * @param regionId
- * valid region id from {@link #getConfiguredRegions()}
- * @throws IllegalArgumentException
- * if {@code regionId} was invalid.
- *
- * @deprecated {@link AsyncBlobStore} is no longer supported. Please use {@link BlobStore} as
- * this method will be removed in jclouds 2.0.
- */
- @Deprecated
- public AsyncBlobStore asyncBlobStoreInRegion(String regionId) {
- return getAsyncBlobStore(regionId);
- }
-
- /**
- * @param regionId
- * valid region id from {@link #getConfiguredRegions()}
- * @throws IllegalArgumentException
- * if {@code regionId} was invalid. longer supported. Please use {@link BlobStore}.
- *
- * @deprecated {@link AsyncBlobStore} is no longer supported. Please use {@link BlobStore} as
- * this method will be removed in jclouds 2.0.
- */
- @Deprecated
- public AsyncBlobStore getAsyncBlobStore(String regionId) {
- checkRegionId(regionId);
- return new SubmissionAsyncBlobStore(blobStoreInRegion(regionId), executor);
- }
-
protected void checkRegionId(String regionId) {
checkArgument(getConfiguredRegions().contains(checkNotNull(regionId, "regionId was null")), "region %s not in %s",
regionId, getConfiguredRegions());