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

patches salt grains locale_info decode error #53897

Merged
merged 8 commits into from Jul 23, 2019

Conversation

@cmcmarrow
Copy link
Contributor

commented Jul 17, 2019

What does this PR do?

Patches python2 timezone decode error

What issues does this PR fix or reference?

#53856

Previous Behavior

Remove this section if not relevant

New Behavior

Remove this section if not relevant

Tests written?

Yes

Commits signed with GPG?

Yes

cmcmarrow added 2 commits Jul 17, 2019
@cmcmarrow cmcmarrow force-pushed the cmcmarrow:timezone_fix branch from 9372a2d to e75dafa Jul 17, 2019
@cmcmarrow

This comment has been minimized.

Copy link
Contributor Author

commented Jul 18, 2019

grains['locale_info']['timezone'] = time.tznam[0].decode('mbcs')

cmcmarrow added 2 commits Jul 18, 2019
@cmcmarrow cmcmarrow force-pushed the cmcmarrow:timezone_fix branch from ee06125 to d041660 Jul 18, 2019
@cmcmarrow cmcmarrow force-pushed the cmcmarrow:timezone_fix branch from 69d2525 to 75571e4 Jul 18, 2019
@dwoz
dwoz approved these changes Jul 18, 2019
@Akm0d
Akm0d approved these changes Jul 18, 2019
@cmcmarrow

This comment has been minimized.

Copy link
Contributor Author

commented Jul 19, 2019

re-run ci/py3/centos7, ci/py3/fedora29

@cmcmarrow

This comment has been minimized.

Copy link
Contributor Author

commented Jul 19, 2019

re-run centos7

@cmcmarrow

This comment has been minimized.

Copy link
Contributor Author

commented Jul 19, 2019

re-run ci/py3/fedora29

@cmcmarrow

This comment has been minimized.

Copy link
Contributor Author

commented Jul 19, 2019

re-run fedora29

@cmcmarrow

This comment has been minimized.

Copy link
Contributor Author

commented Jul 19, 2019

re-run centos7

@cmcmarrow

This comment has been minimized.

Copy link
Contributor Author

commented Jul 19, 2019

re-run ubuntu1604/tcp

@cmcmarrow

This comment has been minimized.

Copy link
Contributor Author

commented Jul 19, 2019

buntu1604

@cmcmarrow

This comment has been minimized.

Copy link
Contributor Author

commented Jul 19, 2019

re-run ubuntu1604/tcp

@cmcmarrow

This comment has been minimized.

Copy link
Contributor Author

commented Jul 19, 2019

re-run ubuntu1604

@cmcmarrow cmcmarrow force-pushed the cmcmarrow:timezone_fix branch from 748b5a7 to bc550ad Jul 19, 2019
@cmcmarrow cmcmarrow force-pushed the cmcmarrow:timezone_fix branch from 9900676 to 592f3fe Jul 22, 2019
@cmcmarrow

This comment has been minimized.

Copy link
Contributor Author

commented Jul 22, 2019

re-run centos7

@cmcmarrow cmcmarrow merged commit 048c097 into saltstack:2019.2.1 Jul 23, 2019
24 checks passed
24 checks passed
WIP Ready for review
Details
ci/docs This commit looks good
Details
ci/lint This commit looks good
Details
ci/py2/amazon2 This commit looks good
Details
ci/py2/centos6 This commit looks good
Details
ci/py2/centos7 This commit looks good
Details
ci/py2/centos7/tcp This commit looks good
Details
ci/py2/debian8 This commit looks good
Details
ci/py2/debian9 This commit looks good
Details
ci/py2/fedora29 This commit looks good
Details
ci/py2/ubuntu1604 This commit looks good
Details
ci/py2/ubuntu1604/tcp This commit looks good
Details
ci/py2/ubuntu1804 This commit looks good
Details
ci/py2/windows2016 This commit looks good
Details
ci/py3/amazon2 This commit looks good
Details
ci/py3/centos7 This commit looks good
Details
ci/py3/centos7/tcp This commit looks good
Details
ci/py3/debian8 This commit looks good
Details
ci/py3/debian9 This commit looks good
Details
ci/py3/fedora29 This commit looks good
Details
ci/py3/ubuntu1604 This commit looks good
Details
ci/py3/ubuntu1604/tcp This commit looks good
Details
ci/py3/ubuntu1804 This commit looks good
Details
ci/py3/windows2016 This commit looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.