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

Back-port #49240 to 2018.3.3 #49362

Merged
merged 2 commits into from Aug 28, 2018

Conversation

Projects
None yet
3 participants
@rallytime
Contributor

rallytime commented Aug 28, 2018

Back-port #49240 to 2018.3.3

Refs saltstack/salt-jenkins#1073

dwoz added some commits Aug 21, 2018

file state test fixes
- fix integration.states.test_file.FileTest.test_managed_latin1_diff
- fix integration.states.test_file.FileTest.test_recurse_issue_40578
- fix some issues integration.states.test_file.FileTest.test_issue_8947_utf8_sls,
  this test still fails due to py2 popen's unicode handling.
@dwoz

dwoz approved these changes Aug 28, 2018

@rallytime rallytime merged commit b4a1e1d into saltstack:2018.3.3 Aug 28, 2018

6 of 8 checks passed

jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py3-ubuntu-1604 running py3-ubuntu-1604...
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details

@rallytime rallytime deleted the rallytime:bp-49240 branch Aug 28, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment