Skip to content

Commit 1928563

Browse files
pdurbinofahimIQSS
andauthored
Update doc/sphinx-guides/source/developers/making-releases.rst
Co-authored-by: Omer Fahim <[email protected]>
1 parent 79041e1 commit 1928563

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

doc/sphinx-guides/source/developers/making-releases.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ In the dataverse-ansible repo bump the version in `jenkins.yml <https://github.c
164164

165165
Once dataverse-ansible has been merged, return to the branch you created above ("10852-bump-to-6.4" or whatever) and make a pull request. Ensure that all tests are passing and then put the PR through the normal review and QA process.
166166

167-
If you are making a hotfix release, ``<base.image.version>`` should already be set to ``${revision}``. If so, leave it alone. Go ahead and do the normal bumping of version numbers descibed above. Make the pull request against the "master" branch. Put it through review and QA. Do not delete the branch after merging because we will later merge it into the "develop" branch to pick up the hotfix. More on this later.
167+
If you are making a hotfix release, ``<base.image.version>`` should already be set to ``${revision}``. If so, leave it alone. Go ahead and do the normal bumping of version numbers described above. Make the pull request against the "master" branch. Put it through review and QA. Do not delete the branch after merging because we will later merge it into the "develop" branch to pick up the hotfix. More on this later.
168168

169169
Merge "develop" into "master" (non-hotfix only)
170170
-----------------------------------------------

0 commit comments

Comments
 (0)