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

[2018.3] Merge forward from 2017.7 to 2018.3 #49454

Merged
merged 48 commits into from Aug 31, 2018

Conversation

Projects
None yet
6 participants
@rallytime
Copy link
Contributor

commented Aug 30, 2018

Conflicts:

  • pkg/osx/build_env.sh
  • salt/modules/win_useradd.py
  • salt/utils/yamldumper.py
  • tests/integration/modules/test_archive.py
  • tests/integration/output/test_output.py

dwoz and others added some commits Aug 24, 2018

Mike Place
Stop running lint on all files when no changes
Stops our lint from running on all of the files in `salt/` or `test/`
when no files were modified. By default, when tox is told to run with no
positional arguments, it'll run on all files we'd look at. When run with
positional arguments it'll run only on those files. This makes it so
that tox, by default, will only run lint checks on commits that actually
change the files in `salt/` or `test/`.
Account for more tests that are not in 2017.7
I also made sure there are no other missing tests since this bit me once
already.
Merge pull request #49379 from dwoz/whitelistagain
Account for more tests that are not in 2017.7
Merge pull request #49324 from dwoz/windows_pr_builds
Add ci scripts for windows PR builds
Merge pull request #49380 from twangboy/doc_48758
Add docs from a comment on issue 48758
Merge pull request #49385 from dwoz/sonofa
The autoruns module has not been renamed
Merge pull request #49390 from dwoz/archive_module
[2017.7] Fix archive tests for py3
Merge pull request #49387 from twangboy/fix_win_repo
Fix winrepo.update_git_repos for masterless minion

gtmanfred and others added some commits Aug 29, 2018

Allow our custom yaml dumper to NamespacedDictWrapper objects
This special dict class did not have a representer assigned to it, so
PyYAML would raise an exception when attempting to dump it.

This also removes the name overriding, as its implementation was
ill-conceived and will be deprecated in a later branch (it's only used
in this one place so deprecating should be of no-to-minimal impact).
Mike Place
Merge pull request #49408 from terminalmage/issue49269
Allow our custom yaml dumper to NamespacedDictWrapper objects
Merge pull request #49389 from gtmanfred/2017.7
make file envs compatible with fileclient formats
Merge pull request #49434 from dwoz/cleanup_exception_handling
Clean up exception handling on py3
Merge pull request #49376 from twangboy/fix_48608
Fix issue with duplicates in user.list_users on OSX
Merge branch '2017.7' into '2018.3'
Conflicts:
  - pkg/osx/build_env.sh
  - salt/modules/win_useradd.py
  - salt/utils/yamldumper.py
  - tests/integration/modules/test_archive.py
  - tests/integration/output/test_output.py

@rallytime rallytime requested a review from saltstack/team-core as a code owner Aug 30, 2018

@dwoz

dwoz approved these changes Aug 30, 2018

@rallytime

This comment has been minimized.

Copy link
Contributor Author

commented Aug 31, 2018

I will fix the test errors today.

@rallytime rallytime merged commit 764b816 into saltstack:2018.3 Aug 31, 2018

4 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py3-windows-2016 running py3-windows-2016...
Details
WIP ready for review
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

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Aug 31, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.