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 main into releases/v2 #1114

Merged
merged 12 commits into from Jun 22, 2022
Merged

Merge main into releases/v2 #1114

merged 12 commits into from Jun 22, 2022

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jun 22, 2022 •
edited by aeisenberg

Merging 2e0c6ca into releases/v2

Conductor for this PR is @aeisenberg

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 releases/v2 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.
  • The v1 release PR is merged after this PR is merged.

criemen and others added 11 commits June 20, 2022 14:05
@criemen
Bump lua tracer version requirement.
99acb8d 
The old version had a bug related to go autobuilding, so we only want to
respect the feature flag for the version that has the fix.
Update changelog and version after v2.1.13
b2786f5
@criemen
Merge pull request #1106 from github/criemen/bump-lua-tracer-version
2318cf7 
Bump lua tracer version requirement.
Update checked-in dependencies
0e17d37
@edoardopirovano
Merge branch 'main' into mergeback/v2.1.13-to-main-d00e8c09
d069ed5
@edoardopirovano
Merge pull request #1108 from github/mergeback/v2.1.13-to-main-d00e8c09
ceacebd 
Mergeback v2.1.13 refs/heads/releases/v2 into main
@edoardopirovano
Fix issue with required checks sync script
5a6f006
@edoardopirovano
Merge pull request #1110 from github/edoardo/case-insensitive-update
47dc295 
Fix issue with required checks sync script
@aeisenberg
Revert "Add capability to filter queries #1098"
99d4397 
#1098
This reverts commit 777b778.
This reverts commit 59ca9b5.
This reverts commit eec34d5.
This reverts commit 40b2800.
@aeisenberg
Merge pull request #1111 from github/aeisenberg/revert-1098
2e0c6ca 
Revert "Add capability to filter queries #1098"
Update changelog for v2.1.14
08f9ac4
@aeisenberg aeisenberg marked this pull request as ready for review June 22, 2022 14:37
@aeisenberg aeisenberg requested a review from a team as a code owner June 22, 2022 14:37
@aeisenberg
Copy link
Contributor

Why didn't the check-for-conflicts job run?

@aeisenberg aeisenberg closed this Jun 22, 2022
auto-merge was automatically disabled June 22, 2022 23:00

Pull request was closed

@aeisenberg aeisenberg reopened this Jun 22, 2022
@aeisenberg
Copy link
Contributor

Closing and re-opening should trigger this job.

@aeisenberg
Copy link
Contributor

Ah...I see! The branches were wrong. Pushing up a fix now. Not sure why this wasn't a required check in the past. Possibly, @edoardopirovano's change to required checks turned this on.

@aeisenberg aeisenberg merged commit 41a4ada into releases/v2 Jun 22, 2022
@aeisenberg aeisenberg deleted the update-v2.1.14-2e0c6caf branch June 22, 2022 23:52
@github-actions github-actions bot mentioned this pull request Jun 22, 2022
Merged
4 tasks
@aliscco aliscco mentioned this pull request Jun 22, 2023
Open
@aliscco aliscco mentioned this pull request Nov 30, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aeisenberg aeisenberg aeisenberg approved these changes

Assignees

@aeisenberg aeisenberg

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@aeisenberg @criemen @edoardopirovano