diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-14 14:02:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-14 14:02:52 +0000 |
| commit | 0597c1ccd31e7264395bcb451b8b6d38d5bfa92f (patch) | |
| tree | 54021dea2f2a4fa3a54b4d3902ddc5cd52cd5449 /doc | |
| parent | e56b2053f1a92d732e5ff0285e21be4dc512ae53 (diff) | |
| parent | 6c9d9ab434ba2ecfee1d556842d311390010957e (diff) | |
Merge "Fix errors in used_limits extension"
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api_samples/os-used-limits/usedlimits-get-resp.json | 4 | ||||
| -rw-r--r-- | doc/api_samples/os-used-limits/usedlimits-get-resp.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/api_samples/os-used-limits/usedlimits-get-resp.json b/doc/api_samples/os-used-limits/usedlimits-get-resp.json index 21ed3a082..c5593b7e7 100644 --- a/doc/api_samples/os-used-limits/usedlimits-get-resp.json +++ b/doc/api_samples/os-used-limits/usedlimits-get-resp.json @@ -14,9 +14,9 @@ "maxTotalRAMSize": 51200, "totalCoresUsed": 0, "totalInstancesUsed": 0, - "totalKeyPairsUsed": 0, "totalRAMUsed": 0, - "totalSecurityGroupsUsed": 0 + "totalSecurityGroupsUsed": 0, + "totalFloatingIpsUsed": 0 }, "rate": [ { diff --git a/doc/api_samples/os-used-limits/usedlimits-get-resp.xml b/doc/api_samples/os-used-limits/usedlimits-get-resp.xml index 745a4828a..c2b0572e5 100644 --- a/doc/api_samples/os-used-limits/usedlimits-get-resp.xml +++ b/doc/api_samples/os-used-limits/usedlimits-get-resp.xml @@ -26,10 +26,10 @@ <limit name="totalRAMUsed" value="0"/> <limit name="totalInstancesUsed" value="0"/> <limit name="maxSecurityGroups" value="10"/> + <limit name="totalFloatingIpsUsed" value="0"/> <limit name="maxTotalCores" value="20"/> <limit name="totalSecurityGroupsUsed" value="0"/> <limit name="maxTotalFloatingIps" value="10"/> - <limit name="totalKeyPairsUsed" value="0"/> <limit name="maxTotalInstances" value="10"/> <limit name="totalCoresUsed" value="0"/> <limit name="maxTotalRAMSize" value="51200"/> |