Skip to content

Forward-port missing v2.15.1 upgrading docs to master branch#10912

Merged
julianbrost merged 1 commit into
masterfrom
forward-port-missing-v2.15.1-upgrading-docs
Jun 30, 2026
Merged

Forward-port missing v2.15.1 upgrading docs to master branch#10912
julianbrost merged 1 commit into
masterfrom
forward-port-missing-v2.15.1-upgrading-docs

Conversation

@julianbrost

@julianbrost julianbrost commented Jun 29, 2026

Copy link
Copy Markdown
Member

During the preparation of the v2.16.2 (and more) releases, I noticed that older support branches contained upgrading docs that are missing from the master branch.

In particular, the Upgrading to v2.15.1, v2.14.7, or v2.13.13 section is missing in both the support/2.16 branch (which is used to render https://icinga.com/docs/icinga-2/latest/doc/16-upgrading-icinga-2/), and the master branch (which will be used to create future support/* branches from).

This PR forward-ports the changes to that everything is on master, so that it's not lost. It's also supposed to be backported so that it appears on https://icinga.com/docs/icinga-2/latest/doc/16-upgrading-icinga-2/ again (where it was lost with the v2.16.0 release).

Quick and dirty shell script to verify what's missing (note that "Upgrading to v2.13.13" and "Upgrading to v2.14.7" are the same as added here, just with a different heading, and "Upgrading to v2.16.2, v2.15.4, or v2.14.9" will be added by #10909):

for branch in origin/support/2.{8..16}; do
  git show "$branch":doc/16-upgrading-icinga-2.md | grep '^#.*Upgrading to'
done | sort -u | while read -r heading; do
  grep -Fe "$heading" doc/16-upgrading-icinga-2.md || echo "MISSING: $heading"
done

@julianbrost julianbrost added this to the 2.17.0 milestone Jun 29, 2026
@julianbrost julianbrost added area/documentation End-user or developer help backport-to-support/2.16 PRs with this label will automatically be backported to the v2.16 support branch. labels Jun 29, 2026
@cla-bot cla-bot Bot added the cla/signed label Jun 29, 2026
@julianbrost julianbrost enabled auto-merge June 29, 2026 15:11
@julianbrost julianbrost merged commit b16c7a9 into master Jun 30, 2026
57 of 58 checks passed
@julianbrost julianbrost deleted the forward-port-missing-v2.15.1-upgrading-docs branch June 30, 2026 07:42
@backbot-ci

backbot-ci Bot commented Jun 30, 2026

Copy link
Copy Markdown

Successfully created backport PR for support/2.16:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/documentation End-user or developer help backport-to-support/2.16 PRs with this label will automatically be backported to the v2.16 support branch. cla/signed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants