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

Merged
merged 46 commits into from Aug 28, 2018

Conversation

Projects
None yet
8 participants
@rallytime
Copy link
Contributor

commented Aug 28, 2018

Conflicts:

  • salt/ext/win_inet_pton.py
  • salt/pillar/git_pillar.py
  • tests/integration/cli/test_batch.py
  • tests/integration/modules/test_archive.py
  • tests/integration/modules/test_pkg.py
  • tests/integration/states/test_file.py
  • tests/support/case.py
  • tests/whitelist.txt

gtmanfred and others added some commits Aug 22, 2018

Re-factor dedent to fix warts
- textwarp.dedent does not support bytes on py3
- make sure to preserve trailing newlines
Update documentation for #48694 and add deprecation warning
There was a behavior change when using `salt-run cache.grains` beginning
with the 2017.7.5 release.

The behavior change happened in PR #45588, which was back-ported to the
2017.7 branch in PR #45751. This was done in order to fix the bug reported
in #45489.

In order to be helpful to users, a deprecation warning was added. If ``tgt``
is not passed, no grains will be listed. Instead of suddenly requiring a ``tgt``
argument in a dot release, let's keep this optional arg around until Sodium.

When Salt Sodium is released, we can remove the warning and change ``tgt`` to be
a mandatory argument.

Fixes the last parts of #48694.
Merge pull request #49320 from rallytime/fix-48694
Update documentation for #48694 and add deprecation warning
Merge pull request #49291 from dwoz/dedent
Add dedent that sets line endings
The set command does not work like inline env vars
Remove set command prefix on windows since it can not be run inline with
other commands.

gtmanfred and others added some commits Aug 27, 2018

Merge pull request #49337 from dwoz/win_service_test_fix
Fix broken service stop test
Merge pull request #49341 from terminalmage/issue48717
Update dynamic git_pillar docs to enclose env name in quotes
Mike Place
upgrade including linux kernels
This is required for ubuntu 14.04 to pass.
Merge pull request #49339 from dwoz/more_tests
[2017.7] Backport whitelist.txt additions
Merge pull request #49353 from dwoz/boto_fix
Do not raise exception if passed bytes
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/ext/win_inet_pton.py
  - salt/pillar/git_pillar.py
  - tests/integration/cli/test_batch.py
  - tests/integration/modules/test_archive.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/states/test_file.py
  - tests/support/case.py
  - tests/whitelist.txt

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

@dwoz

dwoz approved these changes Aug 28, 2018

@rallytime rallytime merged commit ec04282 into saltstack:2018.3 Aug 28, 2018

4 of 5 checks passed

jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
continuous-integration/jenkins/pr-merge This commit looks good
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:merge-2018.3 branch Aug 28, 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.