From 5ebf3c010b324675afe5e8779da4b3d69f8c4858 Mon Sep 17 00:00:00 2001 From: Vladyslav Drok Date: Thu, 25 Aug 2016 18:26:12 +0300 Subject: [PATCH] Update the webapi version history reference This change updates the reference to the doc file that contains the history of API changes, and also fixes one small inconsistency between user-guide and index pages. Change-Id: I7f0410b92cdc08de88c508600309f4df0324c28a --- doc/source/deploy/user-guide.rst | 2 +- ironic/api/controllers/v1/versions.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/source/deploy/user-guide.rst b/doc/source/deploy/user-guide.rst index e76f1875b3..d0121a7321 100644 --- a/doc/source/deploy/user-guide.rst +++ b/doc/source/deploy/user-guide.rst @@ -7,7 +7,7 @@ Introduction to Ironic 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 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 Network services, it is possible to provision both virtual and physical diff --git a/ironic/api/controllers/v1/versions.py b/ironic/api/controllers/v1/versions.py index aa02fb930b..b71bc1e0e5 100644 --- a/ironic/api/controllers/v1/versions.py +++ b/ironic/api/controllers/v1/versions.py @@ -17,8 +17,8 @@ BASE_VERSION = 1 # Here goes a short log of changes in every version. -# Refer to doc/source/webapi/v1.rst for a detailed explanation of what -# each version contains. +# Refer to doc/source/dev/webapi-version-history.rst for a detailed explanation +# of what each version contains. # # v1.0: corresponds to Juno API, not supported since Kilo # 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 # 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 -# changed. +# doc/source/dev/webapi-version-history.rst with a detailed explanation of +# what the version has changed. MINOR_MAX_VERSION = MINOR_22_LOOKUP_HEARTBEAT # String representations of the minor and maximum versions