[AUTO-CHERRYPICK] rust: Upgrade to 1.96.1 - branch 3.0-dev - #18558
[AUTO-CHERRYPICK] rust: Upgrade to 1.96.1 - branch 3.0-dev#18558azurelinux-ci-jwt-app[bot] wants to merge 2 commits into
Conversation
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Auto Cherry-Pick SPEC Validation Summary
|
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 3.1.1 | 3.1.1 | 3.1.1 |
| Release | 12 | 11 | 12 |
| Patches | 1 | 1 | 1 |
| Conflict | Yes |
- Version-release 3.1.1-12 is not higher than Source 3.1.1-12
kata-containers-preview SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 3.27.0~preview2 | 3.27.0~preview2 | 3.27.0~preview2 |
| Release | 2 | 1 | 2 |
| Patches | 2 | 0 | 2 |
| Conflict | Yes |
- Version-release 3.27.0
preview2-2 is not higher than Source 3.27.0preview2-2
ripgrep SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 13.0.0 | 13.0.0 | 13.0.0 |
| Release | 14 | 13 | 14 |
| Patches | 0 | 0 | 0 |
| Conflict | Yes |
- Version-release 13.0.0-14 is not higher than Source 13.0.0-14
rust-cbindgen SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 0.24.3 | 0.24.3 | 0.24.3 |
| Release | 12 | 11 | 12 |
| Patches | 0 | 0 | 0 |
| Conflict | Yes |
- Version-release 0.24.3-12 is not higher than Source 0.24.3-12
tardev-snapshotter SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 3.2.0.tardev1 | 3.2.0.tardev1 | 3.2.0.tardev1 |
| Release | 10 | 9 | 10 |
| Patches | 0 | 0 | 0 |
| Conflict | Yes |
- Version-release 3.2.0.tardev1-10 is not higher than Source 3.2.0.tardev1-10
clamav SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 1.5.4 | 1.5.4 | 1.5.4 |
| Release | 2 | 1 | 2 |
| Patches | 0 | 0 | 0 |
| Conflict | Yes |
- Version-release 1.5.4-2 is not higher than Source 1.5.4-2
cloud-hypervisor SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 51.1.101 | 51.1.101 | 51.1.101 |
| Release | 3 | 2 | 3 |
| Patches | 0 | 0 | 0 |
| Conflict | Yes |
- Version-release 51.1.101-3 is not higher than Source 51.1.101-3
kata-containers-cc SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 3.15.0.aks0 | 3.15.0.aks0 | 3.15.0.aks0 |
| Release | 17 | 17 | 17 |
| Patches | 9 | 12 | 13 |
| Conflict | Yes |
- Version-release 3.15.0.aks0-17 is not higher than Source 3.15.0.aks0-17
- Version-release 3.15.0.aks0-17 is not higher than Target 3.15.0.aks0-17
- Unresolved conflict markers (<<<<<<< / >>>>>>>) found in file
- Duplicate changelog entry for 3.15.0.aks0-17 (appears 2 times)
kata-containers SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 3.32.0.kata0 | 3.32.0.kata0 | 3.32.0.kata0 |
| Release | 4 | 3 | 4 |
| Patches | 5 | 5 | 5 |
| Conflict | Yes |
- Version-release 3.32.0.kata0-4 is not higher than Source 3.32.0.kata0-4
- Changelog out of order: 3.1.0-10 appears before 3.1.3-1
python-cryptography SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 42.0.5 | 42.0.5 | 42.0.5 |
| Release | 6 | 5 | 6 |
| Patches | 4 | 4 | 4 |
| Conflict | Yes |
- Version-release 42.0.5-6 is not higher than Source 42.0.5-6
rust-bootstrap SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 1.95.0 | None | 1.95.0 |
| Release | 1 | None | 1 |
| Patches | 0 | 0 | 0 |
| Conflict | Yes |
- Version-release 1.95.0-1 is not higher than Source 1.95.0-1
- Version-release 1.95.0-1 is not higher than Target None-None
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). 1 pipeline(s) were filtered out due to trigger conditions. |
Co-authored-by: Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> (cherry picked from commit 6669ae7)
0ff55a4 to
f380de3
Compare
|
Copilot Resolve the merge conflicts |
Co-authored-by: KavyaSree2610 <92566732+KavyaSree2610@users.noreply.github.com>
Resolved in a52ef89. The previous commit had left raw conflict markers committed in 4 files, which is what broke Resolutions:
Verified locally: no conflict markers remain, |
|
This auto-cherry-pick PR was not propagated to the 3.0-dev branch through this PR. Instead it was taken through #18631 |
This is an auto-generated pull request to cherry-pick commit 6669ae7 to 3.0-dev. Original PR: #18511
In case of no merge conflicts, the PR is merged without approval because it's an automated cherry-pick of an already approved PR.
In case of merge conflicts, an AI-based conflict resolver will attempt to resolve conflicts and might make mistakes. The reviewer must check AI's work before approving.