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 2.3.x in main #8064

Merged
merged 43 commits into from
Mar 3, 2021
Merged

Merge 2.3.x in main #8064

merged 43 commits into from
Mar 3, 2021

Conversation

dakshvar22
Copy link
Contributor

Proposed changes:

  • ...

Status (please check what you already did):

  • added some tests for the functionality
  • updated the documentation
  • updated the changelog (please check changelog for instructions)
  • reformat files using black (please check Readme for instructions)

@dakshvar22 dakshvar22 requested review from a team and wochinge and removed request for a team February 26, 2021 14:46
alwx and others added 5 commits March 2, 2021 09:37
* Updated 2.X changelog to include 1.10.23 update

* Update 2.3.X changelog.mdx

* Updated link formatting

* Update CHANGELOG.mdx

Co-authored-by: Tobias Wochinger <[email protected]>

Co-authored-by: Tobias Wochinger <[email protected]>
@tmbo tmbo merged commit 8eb2ea4 into main Mar 3, 2021
@tmbo tmbo deleted the merge_2.3.x branch March 3, 2021 09:33
@m-vdb
Copy link
Collaborator

m-vdb commented Mar 3, 2021

@tmbo 😬 why did you merge this branch? the tests were still flaky. I just pushed a commit to fix it: ed134cd

@m-vdb
Copy link
Collaborator

m-vdb commented Mar 3, 2021

Opening another PR to fix it

@tmbo
Copy link
Member

tmbo commented Mar 3, 2021

😂 I needed something from that branch - and it was approved + green so = 🤷. Sorry, it wasn't obvious that this PR wasn't ready yet

@m-vdb
Copy link
Collaborator

m-vdb commented Mar 3, 2021

definitely not on you, Daksh requested help from engineering to merge this on Friday, the integration tests were not passing (actually were flaky). Fixed it in #8094

@tmbo
Copy link
Member

tmbo commented Mar 3, 2021

thanks a lot for jumping on a fix 💯

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.

6 participants