Skip to content

{Branch Management} Fix merge-base: Merge release 2.89.1 hotfixes back to dev - #33878

Closed
Naga Nandyala (naga-nandyala) wants to merge 4 commits into
devfrom
naga/merge-release-2.89.1-back-to-dev
Closed

{Branch Management} Fix merge-base: Merge release 2.89.1 hotfixes back to dev#33878
Naga Nandyala (naga-nandyala) wants to merge 4 commits into
devfrom
naga/merge-release-2.89.1-back-to-dev

Conversation

@naga-nandyala

Copy link
Copy Markdown
Contributor

Fix merge-base between release and dev

This branch starts from the latest dev (43eaf891ed) and merges release (d3d81d5007) with a two-parent merge commit. It brings the 2.89.1 hotfix release history back to dev and advances the merge-base without modifying the shared release branch.

Commits being linked back

Commit PR Description
2e67654b4b #33860 / #33861 Allow SSH certificate flow in Cloud Shell (code already present on dev via #33860)
4af9e3aea1 #33861 Upgrade Azure CLI to 2.89.1
d3d81d5007 #33861 Merge the 2.89.1 hotfix into release

Integration merge

  • Merge commit: 3f631beeb8
  • First parent: latest dev (43eaf891ed)
  • Second parent: release (d3d81d5007)
  • Net diff: 11 release-version and HISTORY files
  • Merge conflicts: none

Merge requirement

Use Create a merge commit. Do not squash or rebase this PR, because preserving the existing two-parent integration commit is what links release history into dev and advances the merge-base.

Reference

Replacement for #33869, following the branch-management intent of #33305 and #33283 while basing the integration branch on the latest dev.

Copilot AI lite review requested due to automatic review settings August 12, 2026 09:04
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

@yonzhan

Copy link
Copy Markdown
Collaborator

Thank you for your contribution! We will review the pull request and get back to you soon.

@naga-nandyala

Copy link
Copy Markdown
Contributor Author

Closing this integration-branch replacement. Reopening #33869 as the direct release -> dev branch-management PR, matching the established process.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR is a branch-management integration merge that advances the merge-base by bringing the release branch’s Azure CLI 2.89.1 hotfix release history back onto dev, without introducing functional code changes beyond the release/version metadata updates.

Changes:

  • Bump Azure CLI and azure-cli-core version strings from 2.89.0 to 2.89.1.
  • Update platform requirements pins to azure-cli==2.89.1 and azure-cli-core==2.89.1.
  • Add 2.89.1 release notes entries and update command/help index JSON version fields to 2.89.1.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated no comments.

Show a summary per file
File Description
src/azure-cli/setup.py Bumps Azure CLI package version to 2.89.1.
src/azure-cli/azure/cli/main.py Updates runtime __version__ to 2.89.1.
src/azure-cli/requirements.py3.Linux.txt Pins azure-cli / azure-cli-core to 2.89.1 for Linux.
src/azure-cli/requirements.py3.Darwin.txt Pins azure-cli / azure-cli-core to 2.89.1 for macOS.
src/azure-cli/requirements.py3.windows.txt Pins azure-cli / azure-cli-core to 2.89.1 for Windows.
src/azure-cli/HISTORY.rst Adds 2.89.1 HISTORY entry describing the hotfix.
src/azure-cli-core/setup.py Bumps azure-cli-core package version to 2.89.1.
src/azure-cli-core/azure/cli/core/init.py Updates azure-cli-core __version__ to 2.89.1.
src/azure-cli-core/HISTORY.rst Adds 2.89.1 HISTORY entry describing the hotfix.
src/azure-cli-core/azure/cli/core/helpIndex.latest.json Updates help index JSON version to 2.89.1.
src/azure-cli-core/azure/cli/core/commandIndex.latest.json Updates command index JSON version to 2.89.1.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

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.

4 participants