Skip to content

backport #674 to v4.15 #678

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

Merged
merged 1 commit into from
May 8, 2023
Merged

backport #674 to v4.15 #678

merged 1 commit into from
May 8, 2023

Conversation

rustagir
Copy link
Collaborator

@rustagir rustagir commented May 8, 2023

merge conflicts in redirects and utf validation page.

* DOCSP-29510: explain how driver handles undefined vals (mongodb#674)

* DOCSP-29510: explain how driver handles undefined vals

* make new subfolder for bson

* tree fixes and redirect-- snooty stuff

* fix version in redirect

* fix highlight

* JS PR fixes 1

* JS suggestion

(cherry picked from commit 52daa59)

* redirect file revert

(cherry picked from commit 157f483)
Comment on lines -19 to -20

>>>>>>> 16e17b7 (DOCSP-29563: redirect CSFLE to Encrypt Fields for all versions (#670))
Copy link
Contributor

Choose a reason for hiding this comment

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

Good catch!

Copy link
Contributor

@ccho-mongodb ccho-mongodb left a comment

Choose a reason for hiding this comment

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

LGTM

@rustagir rustagir merged commit f7c1609 into mongodb:v4.15 May 8, 2023
rustagir added a commit that referenced this pull request May 8, 2023
* DOCSP-29510: explain how driver handles undefined vals (#674)

* DOCSP-29510: explain how driver handles undefined vals

* make new subfolder for bson

* tree fixes and redirect-- snooty stuff

* fix version in redirect

* fix highlight

* JS PR fixes 1

* JS suggestion

(cherry picked from commit 52daa59)

* redirect file revert

(cherry picked from commit 157f483)
(cherry picked from commit f7c1609)
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.

2 participants