Skip to content

Conversation

mongodb-drivers-pr-bot[bot]
Copy link
Contributor

Merge new changes from release/1.17 into v1.

Commits

Resolving conflicts

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

Ignoring changes

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

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

blink1073 and others added 19 commits September 18, 2024 14:43
Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
Co-authored-by: Qingyang Hu <[email protected]>
Co-authored-by: Matt Dale <[email protected]>
…elease/1.17] (#1957)

Co-authored-by: mongodb-drivers-pr-bot[bot] <147046816+mongodb-drivers-pr-bot[bot]@users.noreply.github.com>
Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
Copy link
Contributor Author

API Change Report

No changes found!

alcaeus added 2 commits March 4, 2025 13:47
* commit '9c485751':
  BUMP v1.17.3
  GODRIVER-3448 Limit GOMAXPROCS for fuzz tests (#1939) [v1] (#1943) [release/1.17] (#1957)
  Update reviewers.txt (#1855) [v1] (#1883) [release/1.17] (#1958)
  Cherry pick 1.17.2 work to release/1.17 (#1956)
  GODRIVER-3470 Correct BSON unmarshaling logic for null values (#1924) (#1955)
  GODRIVER-3370 Add bypassEmptyTsReplacement option. (#1927) [release/1.17] (#1954)
  GODRIVER-3340 Bump github.com/klauspost/compress from 1.13.6 to 1.16.7 [release/1.17] (#1880)
  GODRIVER-3374 Add ReadCompressedCompressedMessage back to wiremessage API (#1870)
  Fix data race in 'discard connections' pool test. [v1] (#1877)
  Bump golangci-lint for 1.23 compatibility [v1] (#1875)
  BUMP v1.17.1
  GODRIVER-3156 Detect and discard closed idle connections. (#1815) [release/1.17] (#1841)
  GODRIVER-3313 [release/1.17] Skip CSOT spec tests on Windows and macOS. (#1838)
  GODRIVER-3358 [release/1.17] Do not override authSource from TXT record (#1840)
  GODRIVER-2589 [release/1.17] Clarify `*Cursor.All()` behavior in comment. (#1839)
  DEVPROD-10453 Use assume_role for s3 uploads [release/1.17] (#1824) (#1837)
  update repo metadata
…4499

* release/1.17:
  Use different credentials for merge-up PRs (#1968)
  Add GitHub Actions workflow for merge ups (#1962)
@alcaeus alcaeus force-pushed the merge-release/1.17-into-v1-1741091164499 branch from 2fbd242 to bf51cde Compare March 4, 2025 12:48
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot added the review-priority-low Low Priority PR for Review: within 3 business days label Mar 4, 2025
@alcaeus alcaeus removed the request for review from prestonvasquez March 4, 2025 12:53
@alcaeus alcaeus disabled auto-merge March 4, 2025 12:57
@alcaeus alcaeus merged commit ce4e869 into v1 Mar 4, 2025
24 of 25 checks passed
@alcaeus alcaeus deleted the merge-release/1.17-into-v1-1741091164499 branch March 4, 2025 12:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
review-priority-low Low Priority PR for Review: within 3 business days
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants