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

Don't call os.getppid() on Windows #33941

Merged
merged 1 commit into from
Jun 16, 2016
Merged

Conversation

cachedout
Copy link
Contributor

Fixes #33927

@twangboy Can you verify this works correctly on Windows, please?

@twangboy
Copy link
Contributor

I thought we already fixed this on develop. I added a salt util that added
that functionality.
On Jun 10, 2016 10:35 AM, "Mike Place" notifications@github.com wrote:

Fixes #33927 #33927

@twangboy https://github.com/twangboy Can you verify this works

correctly on Windows, please?

You can view, comment on, or merge this pull request online at:

#33941
Commit Summary

  • Don't call os.getppid() on Windows

File Changes

Patch Links:


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#33941, or mute the thread
https://github.com/notifications/unsubscribe/AI8v_zJ148Ue2erUkG-P7P5RBGNtpAEZks5qKZJjgaJpZM4IzHpg
.

@cachedout
Copy link
Contributor Author

Why would we fix this on develop when it's a bug in 2016.3?

@meggiebot
Copy link

@twangboy is there a PR that we could backport then since it's a bug fix?

@twangboy
Copy link
Contributor

It was fixed to get the master running on Windows.
On Jun 10, 2016 10:53 AM, "Meggie Woodfield" notifications@github.com
wrote:

@twangboy https://github.com/twangboy is there a PR that we could
backport then since it's a bug fix?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#33941 (comment), or mute
the thread
https://github.com/notifications/unsubscribe/AI8v_x_E-0_T_SxiI-ZBz0smoNLq7M29ks5qKZZsgaJpZM4IzHpg
.

@cachedout
Copy link
Contributor Author

@twangboy Can you please point me to your PR which addresses this? It would probably be best just to pull in the pieces of that which address this issue so that we don't end up with merge conflicts.

@twangboy
Copy link
Contributor

twangboy commented Jun 13, 2016

@cachedout #33062
These were changes to make master run on windows.

@thatch45 thatch45 merged commit 5f4ef46 into saltstack:2016.3 Jun 16, 2016
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.

None yet

4 participants