summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-22 10:14:25 +0000
committerGerrit Code Review <review@openstack.org>2016-04-22 10:14:25 +0000
commit83b9e6f3a64debf5924a2a160cbe3eb60c515817 (patch)
treecd281cdb7bafc5fd905ef7d4e0b2b8406af061c7
parent8509e8ed94c45a34dcd89730f03cde35f7914401 (diff)
parentdcc49c54f563f788398cadab2dbb4ae2f33c0d0a (diff)
Merge "Update Preversioning explanation to avoid double that"1.10.0
-rw-r--r--doc/source/index.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/index.rst b/doc/source/index.rst
index b569796..3bee4eb 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -58,10 +58,10 @@ major version increment.
58If postversioning is in use, we use the resulting version number as the target 58If postversioning is in use, we use the resulting version number as the target
59version. 59version.
60 60
61If preversioning is in use - that is, if there is a version set in 61If preversioning is in use we check that the version set in the metadata
62`setup.cfg` metadata - then we check that that version is higher than 62section of `setup.cfg` is greater than the version we infer using the above
63the target version we inferred above. If it is not, we raise an error, 63method. If the inferred version is greater than the preversioning value we
64otherwise we use the version from `setup.cfg` as the target. 64raise an error, otherwise we use the version from `setup.cfg` as the target.
65 65
66We then generate dev version strings based on the commits since the last 66We then generate dev version strings based on the commits since the last
67release and include the current git sha to disambiguate multiple dev versions 67release and include the current git sha to disambiguate multiple dev versions