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

Merge v4.2.2 from 'latest' into 'release-v5.0.0' #2109

Merged
merged 39 commits into from
Aug 8, 2024

Conversation

jemrobinson
Copy link
Member

✅ Checklist

  • You have given your pull request a meaningful title (e.g. Enable foobar integration rather than 515 foobar).
  • You are targeting the appropriate branch. If you're not certain which one this is, it should be develop.
  • Your branch is up-to-date with the target branch (it probably was when you started, but it may have changed since then).

🚦 Depends on

n/a

⤴️ Summary

Merge changes to ensure that develop can be cleanly merged into latest when required.

🌂 Related issues

n/a

🔬 Tests

n/a

jemrobinson and others added 30 commits June 21, 2024 11:38
Change public IP address SKU from basic to standard
Updating user guidance on shared drives
Ensure blob backup storage policy uses OperationalStore
Update link in docs for VPN instructions
Fix markdown linting error
Add extra space before comment
@jemrobinson jemrobinson requested review from a team as code owners August 8, 2024 10:26
@JimMadge JimMadge changed the base branch from develop to release-v5.0.0 August 8, 2024 10:28
@JimMadge JimMadge changed the title Merge v4.2.2 from 'latest' into 'develop' Merge v4.2.2 from 'latest' into 'releave-v5.0.0' Aug 8, 2024
@JimMadge
Copy link
Member

JimMadge commented Aug 8, 2024

I changed the target branch to the release branch.

@JimMadge JimMadge changed the title Merge v4.2.2 from 'latest' into 'releave-v5.0.0' Merge v4.2.2 from 'latest' into 'release-v5.0.0' Aug 8, 2024
@jemrobinson
Copy link
Member Author

@JimMadge : sure - although really this should have been done into develop immediately after we released v4.2.2.

@jemrobinson jemrobinson force-pushed the latest-v4.2.2 branch 2 times, most recently from 8fca9be to 008d346 Compare August 8, 2024 10:37
Copy link

github-actions bot commented Aug 8, 2024

Coverage report

This PR does not seem to contain any modification to coverable code.

@JimMadge
Copy link
Member

JimMadge commented Aug 8, 2024

Probably. I think the branches have diverged enough now that the merge will probably be mostly to discard changes from 4.2.2.

@jemrobinson
Copy link
Member Author

Yes, it is - although with changes to docs it was worth manually checking that the same changes had made it into the v5 docs too.

.lychee.toml Outdated Show resolved Hide resolved
@jemrobinson
Copy link
Member Author

39 commits to make 0 changes to files :)

@jemrobinson jemrobinson merged commit faf88da into release-v5.0.0 Aug 8, 2024
11 checks passed
@jemrobinson jemrobinson deleted the latest-v4.2.2 branch August 8, 2024 10:59
@jemrobinson jemrobinson requested review from craddm and a team and removed request for a team and craddm August 20, 2024 20:52
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