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 main into v1 #734

Merged
merged 9 commits into from
Sep 9, 2021
Merged

Merge main into v1 #734

merged 9 commits into from
Sep 9, 2021

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Sep 9, 2021

Merging 83d5f38 into v1

Conductor for this PR is @adityasharad

Contains the following pull requests:

Please review the following:

  • The CHANGELOG displays the correct version and date.
  • The CHANGELOG includes all relevant, user-facing changes since the last release.
  • There are no unexpected commits being merged into the v1 branch.
  • The docs team is aware of any documentation changes that need to be released.
  • The mergeback PR is merged back into main after this PR is merged.

@edoardopirovano edoardopirovano marked this pull request as ready for review September 9, 2021 11:57
@edoardopirovano edoardopirovano requested a review from a team as a code owner September 9, 2021 11:57
@edoardopirovano
Copy link
Contributor

Triggered mainly to check the refactored PR checks and branch protection rules work on v1 but may as well go ahead with this to get the Action using 2.6.1.

Copy link
Contributor

@edoardopirovano edoardopirovano left a comment

Choose a reason for hiding this comment

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

LGTM. Note 2.6.1 bundled a broken DB upgrade script but this is not a concern here since the Action only works on freshly created DBs.

@edoardopirovano edoardopirovano merged commit 4854dd2 into v1 Sep 9, 2021
@edoardopirovano edoardopirovano deleted the update-v1.0.14-83d5f38d branch September 9, 2021 12:32
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.

3 participants