Increment versions for computefleet releases (resolve conflict for #49529)#49584
Open
weidongxu-microsoft wants to merge 2 commits into
Open
Increment versions for computefleet releases (resolve conflict for #49529)#49584weidongxu-microsoft wants to merge 2 commits into
weidongxu-microsoft wants to merge 2 commits into
Conversation
…ersions-computefleet-49529 # Conflicts: # eng/versioning/version_client.txt
weidongxu-microsoft
requested review from
a team,
ArthurMa1978,
XiaofeiCao and
haolingdong-msft
as code owners
github-actions
Bot
added
the
Mgmt
Contributor
There was a problem hiding this comment.
Pull request overview
This PR resolves the merge conflict in eng/versioning/version_client.txt by keeping the intended version bump for azure-resourcemanager-computefleet and retaining the newer azure-resourcemanager-mongocluster version from main. It aligns the computefleet package metadata (POM + CHANGELOG) with the new beta version for the next release.
Changes:
- Bumps
azure-resourcemanager-computefleetfrom1.1.0-beta.3to1.1.0-beta.4in the module POM. - Adds a new
1.1.0-beta.4 (Unreleased)section to the computefleetCHANGELOG.md. - Updates
eng/versioning/version_client.txtto reflectazure-resourcemanager-computefleet1.1.0-beta.4as the current version.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| sdk/computefleet/azure-resourcemanager-computefleet/pom.xml | Updates Maven artifact version to 1.1.0-beta.4. |
| sdk/computefleet/azure-resourcemanager-computefleet/CHANGELOG.md | Introduces the 1.1.0-beta.4 (Unreleased) changelog section. |
| eng/versioning/version_client.txt | Resolves conflict and sets computefleet current version to 1.1.0-beta.4. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves the merge conflict in �ng/versioning/version_client.txt for #49529.
Conflict resolution:
Net change vs main is limited to the computefleet version bump (�ersion_client.txt, CHANGELOG.md, pom.xml).
Supersedes #49529.
Co-authored-by: Copilot 223556219+Copilot@users.noreply.github.com