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.

Sign up for GitHub

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

Jump to bottom

Merge 3.4 into 3.5 #64

Merged
merged 4 commits into from
Feb 10, 2024
Merged

Merge 3.4 into 3.5 #64

merged 4 commits into from
Feb 10, 2024

Conversation

manadart
Copy link
Member

  • Merge from 3.4 to bring forward usage of BlockedStatus instead of ErrorStatus.
  • Update metadata.yaml with the correct Juju version restriction for this new branch.

Aflynn50
Aflynn50 approved these changes Feb 10, 2024
View reviewed changes
Copy link

@Aflynn50 Aflynn50 left a comment

Choose a reason for hiding this comment

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

LGTM

@manadart manadart merged commit 5ac10db into 3.5 Feb 10, 2024
7 of 8 checks passed
@manadart manadart deleted the 3.4-into-3.5 branch February 10, 2024 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Aflynn50 Aflynn50 Aflynn50 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@manadart @Aflynn50