Skip to content
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

Port #51684 to master #57500

Merged
merged 6 commits into from
Nov 4, 2022
Merged

Port #51684 to master #57500

merged 6 commits into from
Nov 4, 2022

Conversation

terminalmage
Copy link
Contributor

See #51684

@terminalmage terminalmage requested a review from a team as a code owner May 29, 2020 22:17
@ghost ghost requested review from xeacott and removed request for a team May 29, 2020 22:18
xeacott
xeacott previously approved these changes Jun 3, 2020
@Ch3LL
Copy link
Contributor

Ch3LL commented Oct 6, 2022

@terminalmage mind fixing the merge conflict here?

@terminalmage
Copy link
Contributor Author

@Ch3LL There's one failing test here but it seems to be a timeout on standing up the Windows VM to run the test.

Copy link
Contributor

@Ch3LL Ch3LL left a comment

Choose a reason for hiding this comment

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

This will also require a changelog

salt/modules/boto_dynamodb.py Show resolved Hide resolved
salt/modules/boto_dynamodb.py Show resolved Hide resolved
salt/modules/boto_dynamodb.py Outdated Show resolved Hide resolved
salt/modules/boto_dynamodb.py Show resolved Hide resolved
@Ch3LL
Copy link
Contributor

Ch3LL commented Nov 1, 2022

That shouldn't be related. If you could rebase on master before you push the changes I requested and we will see if it fails again. Its not failing like that on the branch tests.

@terminalmage
Copy link
Contributor Author

@Ch3LL I thought I already had rebased onto master, but I might be mistaken. I did a rebase, and I think I've covered all the review comments.

@Ch3LL Ch3LL added Sulfur v3006.0 release code name and version and removed has-failing-test labels Nov 3, 2022
@Ch3LL Ch3LL merged commit 1df1911 into saltstack:master Nov 4, 2022
@terminalmage terminalmage deleted the bp-51684 branch February 12, 2024 23:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
master-port Sulfur v3006.0 release code name and version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants