openstack/ironic
Code Issues Proposed changes

Merge "Update the webapi version history reference"

Browse Source
This commit is contained in:
Jenkins 2016-08-25 20:08:07 +00:00 committed by Gerrit Code Review
commit 245e25bf13
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/deploy/user-guide.rst
View File

@ -7,7 +7,7 @@ Introduction to Ironic
Ironic is an OpenStack project which provisions bare metal (as opposed to Ironic is an OpenStack project which provisions bare metal (as opposed to
virtual) machines. It may be used independently or as part of an OpenStack virtual) machines. It may be used independently or as part of an OpenStack
Cloud, and integrates with the OpenStack Identity (keystone), Compute (nova), Cloud, and integrates with the OpenStack Identity (keystone), Compute (nova),
Network (neutron), and Image (glance) services. Network (neutron), Image (glance) and Object (swift) services.
When the Bare Metal service is appropriately configured with the Compute and When the Bare Metal service is appropriately configured with the Compute and
Network services, it is possible to provision both virtual and physical Network services, it is possible to provision both virtual and physical

8
ironic/api/controllers/v1/versions.py
View File

@ -17,8 +17,8 @@
BASE_VERSION = 1 BASE_VERSION = 1
# Here goes a short log of changes in every version. # Here goes a short log of changes in every version.
# Refer to doc/source/webapi/v1.rst for a detailed explanation of what # Refer to doc/source/dev/webapi-version-history.rst for a detailed explanation
# each version contains. # of what each version contains.
# #
# v1.0: corresponds to Juno API, not supported since Kilo # v1.0: corresponds to Juno API, not supported since Kilo
# v1.1: API at the point in time when versioning support was added, # v1.1: API at the point in time when versioning support was added,
@ -78,8 +78,8 @@ MINOR_21_RESOURCE_CLASS = 21
MINOR_22_LOOKUP_HEARTBEAT = 22 MINOR_22_LOOKUP_HEARTBEAT = 22
# When adding another version, update MINOR_MAX_VERSION and also update # When adding another version, update MINOR_MAX_VERSION and also update
# doc/source/webapi/v1.rst with a detailed explanation of what the version has # doc/source/dev/webapi-version-history.rst with a detailed explanation of
# changed. # what the version has changed.
MINOR_MAX_VERSION = MINOR_22_LOOKUP_HEARTBEAT MINOR_MAX_VERSION = MINOR_22_LOOKUP_HEARTBEAT
# String representations of the minor and maximum versions # String representations of the minor and maximum versions