Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix x.y.z version terminology #3121

Merged
merged 4 commits into from
Jul 28, 2024

Conversation

Lennonka
Copy link
Contributor

@Lennonka Lennonka commented Jul 11, 2024

It must be confusing that we call z-stream "minor version" when it should be called "patch version". This has been bugging me for quite some time.

  • I am okay with my commits getting squashed when you merge this PR.
  • I am familiar with the contributing guidelines.

Please cherry-pick my commits into:

  • Foreman 3.11/Katello 4.13
  • Foreman 3.10/Katello 4.12
  • Foreman 3.9/Katello 4.11 (Satellite 6.15; orcharhino 6.8/6.9)
  • Foreman 3.8/Katello 4.10
  • Foreman 3.7/Katello 4.9 (Satellite 6.14)
  • Foreman 3.6/Katello 4.8
  • Foreman 3.5/Katello 4.7 (Satellite 6.13; orcharhino 6.6/6.7)
  • We do not accept PRs for Foreman older than 3.5.

@Lennonka Lennonka changed the title Fix x.y.z version terminology Fix x.y.z version terminology in Updating Jul 11, 2024
Copy link
Contributor

@maximiliankolb maximiliankolb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@maximiliankolb
Copy link
Contributor

@Lennonka
Copy link
Contributor Author

I've updated the Glossary as well.

@Lennonka

This comment was marked as outdated.

@Lennonka Lennonka force-pushed the fix-term-update-patch-version branch 3 times, most recently from 53253e4 to 7f59a86 Compare July 16, 2024 18:31
@Lennonka
Copy link
Contributor Author

Rebased.

@Lennonka Lennonka force-pushed the fix-term-update-patch-version branch from 7f59a86 to adfa02e Compare July 16, 2024 18:34
@Lennonka
Copy link
Contributor Author

@maximiliankolb Will do the honor of signing it off? :)

@Lennonka Lennonka changed the title Fix x.y.z version terminology in Updating Fix x.y.z version terminology Jul 16, 2024
Copy link
Contributor

@maximiliankolb maximiliankolb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM and matches https://semver.org/

@Lennonka
Copy link
Contributor Author

Should I cherry-pick this or not? I'm still not sure. @maximiliankolb @ekohl

@maximiliankolb
Copy link
Contributor

@Lennonka cherry-picking to 3.11 would be good for me but I have no strong opinion.

@apinnick apinnick merged commit 11c87e1 into theforeman:master Jul 28, 2024
8 checks passed
apinnick pushed a commit that referenced this pull request Jul 28, 2024
* Fix version terminology

* Fix version names

* Turn recommendation into admonition

* Fix release level

(cherry picked from commit 11c87e1)
@apinnick
Copy link
Contributor

Merged and cherry-picked:

e19944c..c3ffe2d 3.11 -> 3.11

@Lennonka Lennonka deleted the fix-term-update-patch-version branch August 3, 2024 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants