Skip to content

Merge v1.21 into v1.x #1703

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

Closed
wants to merge 1 commit into from

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.21 into v1.x.

Commits

Resolving conflicts

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

Ignoring changes

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

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

* Use assume_role command before accessing secrets for atlas-data-lake tests

* Increase task timeout to 30 minutes

* Include AWS expansions when pulling mongohoused image
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner May 26, 2025 08:46
@mongodb-php-bot mongodb-php-bot requested a review from alcaeus May 26, 2025 08:46
@mongodb-php-bot mongodb-php-bot enabled auto-merge May 26, 2025 08:46
@GromNaN GromNaN requested review from GromNaN and removed request for GromNaN May 26, 2025 08:53
@alcaeus
Copy link
Member

alcaeus commented May 26, 2025

Closing and recreating as the Evergreen patch build was not created.

@alcaeus alcaeus closed this May 26, 2025
auto-merge was automatically disabled May 26, 2025 12:35

Pull request was closed

@alcaeus alcaeus deleted the merge-v1.21-into-v1.x-1748249178134 branch June 4, 2025 12:02
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.

3 participants