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

Merged
merged 44 commits into from Mar 21, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Mar 20, 2019

Merge branch '2017.7' into merge-2018.3
Conflicts:

  • tests/integration/modules/test_shadow.py
olipovch and others added 30 commits Jan 28, 2019
Configure the Salt local client to use the master configuration for
syncing to the salt-cloud instance(s).

Fixes #40695
Fix salt-cloud sync_after_install functionality
s0undt3ch and others added 13 commits Mar 15, 2019
Let's not double it.
Let's not double it.
The reason being that at least one unit test case will leak memory until
exhaustion.
[2017.7.9] Lock PyYAML to < 5.1
Conflicts:
* requirements/static/centos-6.txt
* requirements/static/centos-7.txt
* requirements/static/debian-8.txt
* requirements/static/debian-9.txt
* requirements/static/fedora-28.txt
* requirements/static/fedora-29.txt
* requirements/static/opensuse-42.txt
* requirements/static/opensuse-leap-15.txt
* requirements/static/ubuntu-14.04.txt
* requirements/static/ubuntu-16.04.txt
* requirements/static/ubuntu-18.04.txt
Conflicts:
  - tests/integration/modules/test_shadow.py
@garethgreenaway garethgreenaway requested a review from saltstack/team-core as a code owner Mar 20, 2019
@garethgreenaway garethgreenaway merged commit 679c4b2 into saltstack:2018.3 Mar 21, 2019
10 checks passed
10 checks passed
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 Python lint test 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/py2-windows-2016 The py2-windows-2016 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
@garethgreenaway garethgreenaway deleted the garethgreenaway:merge-2018.3 branch Mar 25, 2019
@prometheanfire

This comment has been minimized.

Copy link

commented on cee9480 Oct 7, 2019

uh can we get more info here, I can't package this as we've already moved to newer pyyaml

This comment has been minimized.

Copy link

replied Oct 7, 2019

by more info I mean a link to an upstream bug so we can know when to uncap

This comment has been minimized.

Copy link
Contributor

replied Oct 7, 2019

@cmcmarrow can you weigh in on this?

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