diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-09 17:27:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-09 17:27:19 +0000 |
| commit | c9d01a1cc511cdb9625af8e43293a3b7569fdf51 (patch) | |
| tree | 25c06345529b632a72926268cbd184f941f6a9f1 /doc | |
| parent | 9807d380d3c50cb5a8bf79a4b5c2732ed29496a1 (diff) | |
| parent | 29f7bdc0450d7a755bac6760ef9e43468850a747 (diff) | |
Merge "Remove nova-volume DB"
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api_samples/limit-get-resp.json | 2 | ||||
| -rw-r--r-- | doc/api_samples/limit-get-resp.xml | 2 | ||||
| -rw-r--r-- | doc/api_samples/os-used-limits/usedlimits-get-resp.json | 8 | ||||
| -rw-r--r-- | doc/api_samples/os-used-limits/usedlimits-get-resp.xml | 6 |
4 files changed, 3 insertions, 15 deletions
diff --git a/doc/api_samples/limit-get-resp.json b/doc/api_samples/limit-get-resp.json index 29b7b80b6..1c5aa7a74 100644 --- a/doc/api_samples/limit-get-resp.json +++ b/doc/api_samples/limit-get-resp.json @@ -10,8 +10,6 @@ "maxTotalInstances": 10, "maxTotalKeypairs": 100, "maxTotalRAMSize": 51200, - "maxTotalVolumeGigabytes": 1000, - "maxTotalVolumes": 10, "maxSecurityGroups": 10, "maxSecurityGroupRules": 20 }, diff --git a/doc/api_samples/limit-get-resp.xml b/doc/api_samples/limit-get-resp.xml index b3811a528..a47e0b22f 100644 --- a/doc/api_samples/limit-get-resp.xml +++ b/doc/api_samples/limit-get-resp.xml @@ -20,10 +20,8 @@ <limit name="maxImageMeta" value="128"/> <limit name="maxPersonalitySize" value="10240"/> <limit name="maxTotalKeypairs" value="100"/> - <limit name="maxTotalVolumes" value="10"/> <limit name="maxTotalCores" value="20"/> <limit name="maxTotalFloatingIps" value="10"/> - <limit name="maxTotalVolumeGigabytes" value="1000"/> <limit name="maxTotalRAMSize" value="51200"/> <limit name="maxSecurityGroups" value="10"/> <limit name="maxSecurityGroupRules" value="20"/> 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 e24a1b8bb..f018be9be 100644 --- a/doc/api_samples/os-used-limits/usedlimits-get-resp.json +++ b/doc/api_samples/os-used-limits/usedlimits-get-resp.json @@ -12,15 +12,11 @@ "maxTotalInstances": 10, "maxTotalKeypairs": 100, "maxTotalRAMSize": 51200, - "maxTotalVolumeGigabytes": 1000, - "maxTotalVolumes": 10, "totalCoresUsed": 0, "totalInstancesUsed": 0, "totalKeyPairsUsed": 0, "totalRAMUsed": 0, - "totalSecurityGroupsUsed": 0, - "totalVolumeGigabytesUsed": 0, - "totalVolumesUsed": 0 + "totalSecurityGroupsUsed": 0 }, "rate": [ { @@ -78,4 +74,4 @@ } ] } -}
\ No newline at end of file +} 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 ae14c8158..b86a41555 100644 --- a/doc/api_samples/os-used-limits/usedlimits-get-resp.xml +++ b/doc/api_samples/os-used-limits/usedlimits-get-resp.xml @@ -19,20 +19,16 @@ <limit name="maxPersonality" value="5"/> <limit name="maxImageMeta" value="128"/> <limit name="maxPersonalitySize" value="10240"/> - <limit name="totalVolumesUsed" value="0"/> <limit name="maxSecurityGroupRules" value="20"/> <limit name="maxTotalKeypairs" value="100"/> <limit name="totalCoresUsed" value="0"/> - <limit name="maxTotalVolumes" value="10"/> <limit name="totalRAMUsed" value="0"/> <limit name="totalInstancesUsed" value="0"/> <limit name="maxSecurityGroups" value="10"/> - <limit name="totalVolumeGigabytesUsed" value="0"/> <limit name="maxTotalCores" value="20"/> <limit name="totalSecurityGroupsUsed" value="0"/> <limit name="maxTotalFloatingIps" value="10"/> <limit name="totalKeyPairsUsed" value="0"/> - <limit name="maxTotalVolumeGigabytes" value="1000"/> <limit name="maxTotalRAMSize" value="51200"/> </absolute> -</limits>
\ No newline at end of file +</limits> |