Merge branch 'master' of github.com:jclouds/jclouds into 1.5.x

* 'master' of github.com:jclouds/jclouds:
  corrected api metadata
This commit is contained in:
Adrian Cole 2012-06-19 01:21:38 -06:00
commit c800b354d5
4 changed files with 4 additions and 4 deletions

View File

@ -93,7 +93,7 @@ public class NovaApiMetadata extends BaseRestApiMetadata {
super(NovaClient.class, NovaAsyncClient.class); super(NovaClient.class, NovaAsyncClient.class);
id("openstack-nova") id("openstack-nova")
.name("OpenStack Nova Diablo+ API") .name("OpenStack Nova Diablo+ API")
.identityName("tenantIdOrName:user") .identityName("tenantName:user or user")
.credentialName("password") .credentialName("password")
.documentation(URI.create("http://api.openstack.org/")) .documentation(URI.create("http://api.openstack.org/"))
.version("1.1") .version("1.1")

View File

@ -83,7 +83,7 @@ public class SwiftApiMetadata extends BaseRestApiMetadata {
super(syncClient, asyncClient); super(syncClient, asyncClient);
id("swift") id("swift")
.name("OpenStack Swift Pre-Diablo API") .name("OpenStack Swift Pre-Diablo API")
.identityName("tenantId:user") .identityName("tenantName:user or user")
.credentialName("password") .credentialName("password")
.documentation(URI.create("http://api.openstack.org/")) .documentation(URI.create("http://api.openstack.org/"))
.version("1.0") .version("1.0")

View File

@ -80,7 +80,7 @@ public class GlanceApiMetadata extends BaseRestApiMetadata {
super(GlanceClient.class, GlanceAsyncClient.class); super(GlanceClient.class, GlanceAsyncClient.class);
id("openstack-glance") id("openstack-glance")
.name("OpenStack Glance API") .name("OpenStack Glance API")
.identityName("tenantId:user") .identityName("tenantName:user or user")
.credentialName("password") .credentialName("password")
.documentation(URI.create("http://glance.openstack.org/glanceapi.html")) .documentation(URI.create("http://glance.openstack.org/glanceapi.html"))
.version("1.0") .version("1.0")

View File

@ -79,7 +79,7 @@ public class QuantumApiMetadata extends BaseRestApiMetadata {
super(QuantumClient.class, QuantumAsyncClient.class); super(QuantumClient.class, QuantumAsyncClient.class);
id("openstack-quantum") id("openstack-quantum")
.name("OpenStack Quantum API") .name("OpenStack Quantum API")
.identityName("tenantId:user") .identityName("tenantName:user or user")
.credentialName("password") .credentialName("password")
.documentation(URI.create("http://docs.openstack.org/api/openstack-network/1.0/content/")) .documentation(URI.create("http://docs.openstack.org/api/openstack-network/1.0/content/"))
.version("1.0") .version("1.0")