Skip to content

Port #52241 to master#56440

Merged
dwoz merged 8 commits intosaltstack:masterfrom
Ch3LL:port_52241
May 6, 2020
Merged

Port #52241 to master#56440
dwoz merged 8 commits intosaltstack:masterfrom
Ch3LL:port_52241

Conversation

@Ch3LL
Copy link
Copy Markdown
Contributor

@Ch3LL Ch3LL commented Mar 24, 2020

Port #52241 to master. It was previously on the devleop branch waiting to be merged in.

@Ch3LL Ch3LL requested a review from a team as a code owner March 24, 2020 15:43
@ghost ghost requested a review from dwoz March 24, 2020 15:44
@Ch3LL Ch3LL self-assigned this Mar 24, 2020
s0undt3ch
s0undt3ch previously approved these changes Apr 21, 2020
@s0undt3ch
Copy link
Copy Markdown
Contributor

We now have conflicts that need to be solved, likely black related.

Austin Papp added 5 commits April 23, 2020 15:47
* salt/runner.py::_run_runner was always returning {retcode: 70}. removed the else logic
* fixed some tests
@sagetherage sagetherage assigned xeacott and unassigned Ch3LL May 5, 2020
@dwoz dwoz merged commit 7d90120 into saltstack:master May 6, 2020
s0undt3ch added a commit to s0undt3ch/salt that referenced this pull request May 14, 2020
This change was merged into master in saltstack#56440 which was a port to master effort from saltstack#52241

Fixes saltstack#57278
dwoz pushed a commit that referenced this pull request May 14, 2020
This change was merged into master in #56440 which was a port to master effort from #52241

Fixes #57278
@sagetherage sagetherage added the ZRelease-Sodium retired label label May 18, 2020
@max-arnold
Copy link
Copy Markdown
Contributor

I do not believe it will work as intended, because the prerequisite PR was not backported to develop from old Neon: #51629

@max-arnold max-arnold mentioned this pull request Feb 6, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ZRelease-Sodium retired label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants