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

Merged
merged 15 commits into from Jun 7, 2018

Conversation

Projects
None yet
5 participants
@rallytime
Contributor

rallytime commented Jun 6, 2018

No conflicts.

damon-atkins and others added some commits Jun 1, 2018

Remove m2crypto download for Windows
Fix pip issue with pip 10
Clarify pillar.get docs
Explicitly state that pillar.get pulls from in-memory pillar data.
Merge pull request #47944 from terminalmage/fix-git.detached-docs
Replace use of deprecated argument name in git.detached docstring
Fix postfix.set_main's assumption of prefix-free key names
Salt's "postfix.set_main" module function used "line.startswith()"
for determining which entries from "main.cf" to keep and which to
overwrite. This matched more lines that intended, though, as the names
of Postfix' configuration options aren't prefix-free.

For example, both "virtual_transport" and
"virtual_transport_rate_delay" are valid and known keys. Therefore
trying to set "virtual_transport" would lead to
"virtual_transport_rate_delay" being replaced, too, by another
instance of "virtual_transport".

The new method matches the line based on the key name being terminated
by whitespace, an equal sign or the end of the line.

Fixes #47888.
Merge pull request #47922 from damon-atkins/2017.7_win_pkg_keys_fix
win_pkg: pkg.refresh_db verbose=True PY3 compatibility fix
Merge pull request #47824 from twangboy/fix_setup.py
Fix issues with setup.py in Windows
Merge pull request #47966 from mbunkus/fix-postfix-prefix-free-key-na…
…mes-assumption

Fix postfix.set_main's assumption of prefix-free key names

@rallytime rallytime merged commit 3d0a087 into saltstack:2018.3 Jun 7, 2018

5 of 9 checks passed

jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19599 — ABORTED
Details
default Build finished.
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17809 — FAILURE
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5544 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25742 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23476 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10516 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22440 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Jun 7, 2018

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