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 2018.3.4 to 2018.3 #51580

Merged
merged 90 commits into from Feb 11, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Feb 11, 2019

Merge branch '2018.3.4' into merge-2018.3.4

Conflicts:

  • tests/integration/states/test_file.py
  • tests/unit/states/test_file.py
  • tests/unit/utils/test_dns.py
dwoz and others added 30 commits Jan 22, 2019
Adds tests for pillar and file roots validation
Warn about proper validation option
…s, eg. windows systems.
Fix issue with case sensitivity
This is fixed via another PR (#51274)
Backport #51233 into 2018.3.4
Backport #51279 into 2018.3.4
Backport #51226 into 2018.3.45
#50417 caused a regression in
which the env name is not properly detected as `base` when
`get_checkout_target()` returns the branch name corresponding to that
repo's `base` config option. This corrects that regression.
Fix failing test `unit.states.test_file.TestFileState.test_managed` on Windows
Fix regression in dynamic pillarenv
[2018.3.4] Fix minion start
garethgreenaway and others added 24 commits Feb 6, 2019
Add Py2 Warning for Py2 Installer
Backport #51366 into 2018.3.4
The +nocl is supported much wider than +noclass
Update man pages for 2018.3.4
Backport 51095 to 2018.3.4
2018.3.4 releasenotes
…dle_mariadb_versions

[2018.3.4] Updating the mysql module to handle MariDB versions.
Convert data to string using salt util
Remove in progress from 2018.3.4 releasenotes
Fix ssh on Windows (2018.3.4)
Update url to libsodium for mac builds
 Conflicts:
	tests/integration/states/test_file.py
	tests/unit/states/test_file.py
	tests/unit/utils/test_dns.py
@garethgreenaway garethgreenaway requested a review from saltstack/team-core as a code owner Feb 11, 2019
Copy link
Contributor

left a comment

Windows and Mac stuff looks good

@garethgreenaway garethgreenaway merged commit 41e25a6 into saltstack:2018.3 Feb 11, 2019
8 of 10 checks passed
8 of 10 checks passed
continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
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
@garethgreenaway garethgreenaway deleted the garethgreenaway:merge-2018.3.4 branch Feb 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
10 participants
You can’t perform that action at this time.