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

develop ⬅️ master for v1.92.0 #9072

Merged
merged 5 commits into from
May 1, 2023
Merged

develop ⬅️ master for v1.92.0 #9072

merged 5 commits into from
May 1, 2023

Conversation

bnussman-akamai
Copy link
Member

Description 📝

  • Merges master into develop to pick up changes to changelog and versions

@bnussman-akamai bnussman-akamai added the Release Cloud Manager releases label May 1, 2023
@bnussman-akamai bnussman-akamai self-assigned this May 1, 2023
@bnussman-akamai
Copy link
Member Author

Yikes, what are we going to have to do about the conflicts here?

@cypress
Copy link

cypress bot commented May 1, 2023

2 flaky tests on run #3271 ↗︎

0 151 3 0 Flakiness 2

Details:

Merge pull request #9070 from linode/staging
Project: Cloud Manager E2E Commit: 39cb5c5e30
Status: Passed Duration: 16:36 💡
Started: May 1, 2023 8:56 PM Ended: May 1, 2023 9:13 PM
Flakiness  account/google-pay.spec.ts • 1 flaky test

View Output Video

Test Artifacts
Google Pay > tests make payment flow - google pay Output Screenshots Video
Flakiness  volumes/resize-volume.spec.ts • 1 flaky test

View Output Video

Test Artifacts
volume resize flow > resizes a volume Output Screenshots Video

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@mjac0bs
Copy link
Contributor

mjac0bs commented May 1, 2023

Yikes, what are we going to have to do about the conflicts here?

When I did the last release, I had to resolve CHANGELOG.md conflicts locally and merge master into develop via the command line. This PR will update to be "merged" when that's done.

@bnussman-akamai bnussman-akamai merged commit 6cee8b8 into develop May 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Release Cloud Manager releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants