Merge branch 'master' of github.com:jclouds/jclouds into 1.5.x
* 'master' of github.com:jclouds/jclouds:
Sets endpoint for cloudservers-uk
usage example
diff --git a/core/src/main/java/org/jclouds/View.java b/core/src/main/java/org/jclouds/View.java
index e61a51a..0a6f18d 100644
--- a/core/src/main/java/org/jclouds/View.java
+++ b/core/src/main/java/org/jclouds/View.java
@@ -46,6 +46,10 @@
* context. If the backend context is not assignable from the supplied type,
* an {@link IllegalArgumentException} is thrown.
*
+ * ex.
+ * <pre>
+ * RestContext<NovaClient, NovaAsyncClient> backendApi = computeContext.unwrap(NovaApiMetadata.CONTEXT_TOKEN);
+ * </pre>
* @param type
* the type of the context to be returned. The backend context must
* be assignable from this type.
diff --git a/providers/cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderMetadata.java b/providers/cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderMetadata.java
index fcfb0f0..54e9294 100644
--- a/providers/cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderMetadata.java
+++ b/providers/cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderMetadata.java
@@ -65,6 +65,7 @@
id("cloudservers-uk")
.name("Rackspace Cloud Servers UK")
.apiMetadata(new CloudServersApiMetadata())
+ .endpoint("https://lon.auth.api.rackspacecloud.com")
.homepage(URI.create("http://www.rackspace.co.uk/cloud-hosting/cloud-products/cloud-servers"))
.console(URI.create("https://lon.manage.rackspacecloud.com"))
.linkedServices("cloudloadbalancers-uk", "cloudservers-uk", "cloudfiles-uk")
