summaryrefslogtreecommitdiffstats
path: root/doc/source
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-04-10 22:23:11 +0000
committerGerrit Code Review <review@openstack.org>2012-04-10 22:23:11 +0000
commit4f631ca24b9652cfcf761c121441a07b63571e57 (patch)
tree4f99ec27bf55f74e1a2dbb492faaf52240a84baf /doc/source
parent35005b08401f571ccd079e4f03595b78ae0cbe38 (diff)
parent6606f036a6b0b5c100374767c3a05ab06d410852 (diff)
downloadnova-4f631ca24b9652cfcf761c121441a07b63571e57.tar.gz
nova-4f631ca24b9652cfcf761c121441a07b63571e57.tar.xz
nova-4f631ca24b9652cfcf761c121441a07b63571e57.zip
Merge "Update doc to mention nova tool for type creation"
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/runnova/managing.instance.types.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/source/runnova/managing.instance.types.rst b/doc/source/runnova/managing.instance.types.rst
index c4a405a8d..29e653697 100644
--- a/doc/source/runnova/managing.instance.types.rst
+++ b/doc/source/runnova/managing.instance.types.rst
@@ -29,7 +29,7 @@ Instance types can be in either the active or inactive state:
* Active instance types are available to be used for launching instances
* Inactive instance types are not available for launching instances
-In the current (Cactus) version of nova, instance types can only be created by the nova administrator through the nova-manage command. Future versions of nova (in concert with the OpenStack API or EC2 API), may expose this functionality directly to users.
+In the current (Essex) version of nova, instance types can be created by the nova administrator through the nova-manage command, or the nova command (which uses the OpenStack API).
Basic Management
----------------