summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-19 01:58:25 +0000
committerGerrit Code Review <review@openstack.org>2012-11-19 01:58:25 +0000
commit308285c1640d847833e062b8cff749c69aa6bb5a (patch)
treebb36bcb676c7ff58c2caf15efa1ef8a14688f7c9
parent1bf79e14ff12c0cde03c928ed957d76f2f8186b9 (diff)
parent61ac6726bdc2a81ed69471980d3e722f87fb620f (diff)
Merge "update api_samples add os-services module"
-rw-r--r--doc/api_samples/all_extensions/extensions-get-resp.json10
-rw-r--r--doc/api_samples/all_extensions/extensions-get-resp.xml5
2 files changed, 13 insertions, 2 deletions
diff --git a/doc/api_samples/all_extensions/extensions-get-resp.json b/doc/api_samples/all_extensions/extensions-get-resp.json
index f4dfa0683..155a877c2 100644
--- a/doc/api_samples/all_extensions/extensions-get-resp.json
+++ b/doc/api_samples/all_extensions/extensions-get-resp.json
@@ -297,6 +297,14 @@
"updated": "2012-01-23T00:00:00+00:00"
},
{
+ "alias": "os-services",
+ "description": "Services support",
+ "links": [],
+ "name": "Services",
+ "namespace": "http://docs.openstack.org/compute/ext/services/api/v2",
+ "updated": "2012-10-28T00:00:00-00:00"
+ },
+ {
"alias": "os-simple-tenant-usage",
"description": "Simple tenant usage extension",
"links": [],
@@ -337,4 +345,4 @@
"updated": "2011-03-25T00:00:00+00:00"
}
]
-}
+} \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml
index de18e5a2b..ad10c671b 100644
--- a/doc/api_samples/all_extensions/extensions-get-resp.xml
+++ b/doc/api_samples/all_extensions/extensions-get-resp.xml
@@ -125,6 +125,9 @@
<extension alias="os-server-start-stop" updated="2012-01-23T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/servers/api/v1.1" name="ServerStartStop">
<description>Start/Stop instance compute API support</description>
</extension>
+ <extension alias="os-services" updated="2012-10-28T00:00:00-00:00" namespace="http://docs.openstack.org/compute/ext/services/api/v2" name="Services">
+ <description>Services support</description>
+ </extension>
<extension alias="os-simple-tenant-usage" updated="2011-08-19T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/os-simple-tenant-usage/api/v1.1" name="SimpleTenantUsage">
<description>Simple tenant usage extension</description>
</extension>
@@ -140,4 +143,4 @@
<extension alias="os-volumes" updated="2011-03-25T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/volumes/api/v1.1" name="Volumes">
<description>Volumes support</description>
</extension>
-</extensions>
+</extensions> \ No newline at end of file