Merge v1.x into v2.x #1773
Merged
Merge v1.x into v2.x #1773
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Install Python 3.13 for drivers-evergreen-tools GH action Related to mongodb/mongo-php-library#1564
* PHPC-2477: BSON_HAVE_ATOMIC constants are obsolete CDRIVER-4124 removed BSON_HAVE_ATOMIC_32_ADD_AND_FETCH and BSON_HAVE_ATOMIC_64_ADD_AND_FETCH * PHPC-2477: BSON_PTHREAD_ONCE_INIT_NEEDS_BRACES is obsolete CDRIVER-2694 removed BSON_PTHREAD_ONCE_INIT_NEEDS_BRACES * PHPC-2477: BSON_HAVE_REALLOCF is obsolete BSON_HAVE_REALLOCF was no longer used when libbson was vendored in CDRIVER-2416 * PHPC-2477: BSON_HAVE_SYSCALL_TID is obsolete CDRIVER-2771 removed outstanding references to BSON_HAVE_SYSCALL_TID * PHPC-2477: BSON_NEEDS_SET_OUTPUT_FORMAT is obsolete * PHPC-2477: BSON_HAVE_DECIMAL128 is obsolete * PHPC-2477: BSON_HAVE_ARC4RANDOM_BUF is obsolete * PHPC-2477: MONGOC_ENABLE_SASL_GSSAPI is obsolete CDRIVER-2654 removed MONGOC_ENABLE_SASL_GSSAPI. PHPC-2312 removed it from Autotools, but it was left behind in config.w32. * PHPC-2477: MONGOC_HAVE_WEAK_SYMBOLS is obsolete CDRIVER-2600 removed MONGOC_HAVE_WEAK_SYMBOLS
Closed
|
@jmikola This PR has conflicts with v2.x |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge new changes from v1.x into v2.x.
Commits
To resolve any conflicts, check out the temporary branch and run the following command:Resolving conflicts
To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:Ignoring changes
Then, push the temporary branch to upate the pull request.