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

fix(NODE-5262, NODE-5311): batch backport #3683

Merged
merged 3 commits into from
May 26, 2023
Merged

Conversation

baileympearson
Copy link
Contributor

@baileympearson baileympearson commented May 24, 2023

Description

What is changing?

Backports #3663 and #3682.

Also updates CI scripts to pull in mongodb-client-encryption@2.8.0.

Is there new documentation needed for these changes?

What is the motivation for this change?

Double check the following

  • Ran npm run check:lint script
  • Self-review completed using the steps outlined here
  • PR title follows the correct format: type(NODE-xxxx)[!]: description
    • Example: feat(NODE-1234)!: rewriting everything in coffeescript
  • Changes are covered by tests
  • New TODOs have a related JIRA ticket

@baileympearson baileympearson changed the title fix(no-story): batch fix backport fix(no-story): batch backport May 24, 2023
@baileympearson baileympearson changed the title fix(no-story): batch backport fix(NODE-5262, NODE-5311): batch backport May 24, 2023
baileympearson added a commit to baileympearson/node-mongodb-native that referenced this pull request May 25, 2023
baileympearson pushed a commit to baileympearson/node-mongodb-native that referenced this pull request May 25, 2023
baileympearson added a commit to baileympearson/node-mongodb-native that referenced this pull request May 25, 2023
@baileympearson baileympearson force-pushed the no-story-misc-backports branch from aa236d5 to 6e3a374 Compare May 25, 2023 16:20
@baileympearson baileympearson force-pushed the no-story-misc-backports branch from 6e3a374 to acaf1a0 Compare May 25, 2023 16:49
@baileympearson baileympearson force-pushed the no-story-misc-backports branch from acaf1a0 to ba20eca Compare May 25, 2023 18:03
@baileympearson baileympearson marked this pull request as ready for review May 25, 2023 20:05
@durran durran self-assigned this May 26, 2023
@durran durran added the Primary Review In Review with primary reviewer, not yet ready for team's eyes label May 26, 2023
@durran durran added Team Review Needs review from team and removed Primary Review In Review with primary reviewer, not yet ready for team's eyes labels May 26, 2023
Copy link
Contributor

@dariakp dariakp left a comment

Choose a reason for hiding this comment

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

Is that merge commit going to show up on 4.x if you do the rebase/fast-forward?

@baileympearson baileympearson force-pushed the no-story-misc-backports branch from ed9a937 to f4e31ba Compare May 26, 2023 14:15
@durran durran merged commit 98b7bdf into 4.x May 26, 2023
@durran durran deleted the no-story-misc-backports branch May 26, 2023 14:49
durran pushed a commit that referenced this pull request May 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Team Review Needs review from team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants