Skip to content

Merge v1.19 into master #1578

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 3 commits into from
Jun 7, 2024
Merged

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.19 into master.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge master

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to master and manually merge using the `ours` merge strategy:
git reset --hard master
git merge --strategy=ours v1.19

Then, push the temporary branch to upate the pull request.

Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
@mongodb-php-bot mongodb-php-bot enabled auto-merge June 6, 2024 13:56
@jmikola jmikola disabled auto-merge June 7, 2024 17:33
@jmikola jmikola merged commit 774ee78 into master Jun 7, 2024
34 of 35 checks passed
@jmikola jmikola deleted the merge-v1.19-into-master-1717682180771 branch June 7, 2024 17:33
@alcaeus alcaeus mentioned this pull request Jun 11, 2024
alcaeus added a commit that referenced this pull request Sep 4, 2024
* master: (22 commits)
  PHPC-2434: Add PHP 8.4 to GitHub Actions (#1625)
  PHPC-2421, PHPC-2428: Update bundled dependencies (#1622)
  Don't build libmongoc version in pull requests
  Use drivers-evergreen-tools for Windows testing (#1615)
  PHPC-1957 Add tests for out-of-range UTCDateTime values (#1614)
  PHPC-2286 Implement `UTCDateTime::toDateTimeImmutable` (#1611)
  PHPC-2414, PHPC-2415: Update wire versions for MongoDB 8.0 compatibility (#1610)
  PHPC-2349, PHPC-2411: Deprecate unused exception classes (#1608)
  Fix failing tests on x86 systems (#1609)
  PHPC-2347: Deprecate BSON functions (#1607)
  PHPC-1489: Deprecate integer readPreference constants (#1604)
  Fix version computation for libmongoc development versions (#1599)
  PHPC-2376: Test against MongoDB 8.0 (#1598)
  PHPC-2254: Relax server selection timeout error message pattern (#1587)
  PHPC-2401: Support QEv2 range protocol (#1583)
  PHPC-2398: Use server_id methods for libmongoc 1.28+ (#1582)
  PHPC-2395: Fetch Atlas connectivity URIs from AWS Secrets Manager (#1579)
  Merge v1.19 into master (#1578)
  Revert "Bump mongodb-labs/drivers-github-tools from 1 to 2 (#1568)" (#1571)
  Bump mongodb-labs/drivers-github-tools from 1 to 2 (#1568)
  ...
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