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.

Sign up for GitHub

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

Jump to bottom

[master] Porting #49148 to master #54682

Merged
merged 5 commits into from
Sep 28, 2022
Merged

[master] Porting #49148 to master #54682

merged 5 commits into from
Sep 28, 2022

Conversation

garethgreenaway
Copy link
Contributor

@garethgreenaway garethgreenaway commented Sep 19, 2019 •
edited
Loading

Porting #49148 to master

@garethgreenaway garethgreenaway requested a review from a team September 19, 2019 01:27
@ghost ghost requested review from xeacott and removed request for a team September 19, 2019 01:27
@garethgreenaway garethgreenaway changed the title [2019.2.1] Porting #49148 to 2019.2.1 [master] Porting #49148 to master Sep 24, 2019
@garethgreenaway garethgreenaway changed the base branch from 2019.2.1 to master September 24, 2019 22:32
@dwoz dwoz added the Needs-Testcase PR needs test cases written, or the issue is about a bug/feature that needs test cases label Dec 13, 2019
@garethgreenaway garethgreenaway requested a review from a team as a code owner December 20, 2019 23:23
@garethgreenaway garethgreenaway removed the Needs-Testcase PR needs test cases written, or the issue is about a bug/feature that needs test cases label Dec 20, 2019
s0undt3ch
s0undt3ch reviewed Dec 21, 2019
View reviewed changes
salt/grains/core.py Outdated Show resolved Hide resolved
s0undt3ch
s0undt3ch previously approved these changes Jan 5, 2020
View reviewed changes
@sagetherage sagetherage removed the request for review from xeacott December 3, 2020 17:40
@garethgreenaway garethgreenaway added the Sulfur v3006.0 release code name and version label Sep 26, 2022
@garethgreenaway garethgreenaway added this to the Sulphur v3006.0 milestone Sep 26, 2022
Ch3LL
Ch3LL suggested changes Sep 27, 2022
View reviewed changes
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 port is missing this line: https://github.com/saltstack/salt/pull/49148/files#diff-1d38435cf2b529355dec413e02b3fdc26f1af1d89f119891c68c4e9cf5630062R143

is this on purpose?

also this will require a changelog

@garethgreenaway
Copy link
Contributor Author

@Ch3LL Good catch. Looks like something that just got missed in the origin PR.

@Ch3LL
Copy link
Contributor

Ch3LL commented Sep 27, 2022

thanks, looks like this will also need a changelog

@garethgreenaway
Copy link
Contributor Author

@Ch3LL done.

@Ch3LL Ch3LL merged commit 784777c into saltstack:master Sep 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dwoz dwoz dwoz left review comments

@Ch3LL Ch3LL Ch3LL approved these changes

@s0undt3ch s0undt3ch s0undt3ch left review comments

Assignees

@garethgreenaway garethgreenaway

Labels
master-port Sulfur v3006.0 release code name and version
Projects
None yet
Milestone
Sulfur v3006.0
Development

Successfully merging this pull request may close these issues.
4 participants
@garethgreenaway @Ch3LL @s0undt3ch @dwoz