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 #49867

Merged
merged 25 commits into from Oct 3, 2018

Conversation

Projects
None yet
6 participants
@rallytime
Copy link
Contributor

commented Oct 2, 2018

Conflicts:

  • salt/state.py
  • salt/utils/hashutils.py
  • tests/integration/modules/test_state.py

twangboy and others added some commits Sep 24, 2018

Add ability to clear DNS entries on static DNS
Execution Module:
- Passing no DNS servers will clear the list.
- Update documentation
- Added a note about clearing DNS entries

State Module
- An empty list in dns_servers will clear the entires
- None in dns_servers will do nothing (default behavior)
- Update Documentation
Only clear dns entries if you pass []
Add test=True support when clearing
Add/fix tests
Use named parameters where possible
Fix parallel states with long ID dec or name
The cache files used for these are based on the state's tag, so longer
ID decs or names will cause errors when the filename's length exceeds
the max allowed by the kernel.

This fixes these errors by taking (up to) the first 32 chars of the
result of base64-encoding the tag, and using that as the parallel cache
filename.
Remove/replace unnecessary setUp/tearDown
The setUp only needs to run at the beginning so it can be a setUpClass,
and the tearDown logic only applied to a single test and should not be
run after each test.
Explicitly import salt.utils.hashutils
The code works without this because at least one of the other modules
being imported also imports this. But explicitly importing it here will
keep us from getting bitten if the imports change elsewhere later on.
Mike Place
Merge pull request #49763 from twangboy/fix_49730
Add ability to clear DNS entries on static DNS
Merge pull request #49777 from terminalmage/issue49738
Fix parallel states with long ID dec or name
Fix badly formatted versionadded directive
A space here will cause the Sphinx role to treat whatever is after the
comma as the comment for the directive, so it will be rendered with
different CSS and look weird. Also, this fixes one syntactically
incorrect versionadded which included a typo.
Merge pull request #49848 from terminalmage/fix-version-rst-2017.7
Fix badly formatted versionadded directive (2017.7 branch)
Merge pull request #49828 from dwoz/testslogencoding
Use utf-8 encoding for salt-runtests.log
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/state.py
  - salt/utils/hashutils.py
  - tests/integration/modules/test_state.py

@dwoz dwoz requested a review from twangboy Oct 2, 2018

@dwoz

dwoz approved these changes Oct 2, 2018

@rallytime rallytime merged commit 05cd56b into saltstack:2018.3 Oct 3, 2018

8 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
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-centos-7 The py2-centos-7 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
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Oct 3, 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.