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

Merged
merged 19 commits into from Feb 23, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Feb 22, 2019

Conflicts:

  • None
martin-paulus and others added 18 commits Feb 5, 2019
…idate-ALIAS-A-records
… using openssl 1.1.1-1.
…t-key to break.
… use the defaults.
…ster_openssl

[2017.7] Removing unused salt.crypt imports
Backport 51471
[2017.7] Fix ruby gems tests, again
[2017.7] Add initial nox configuration. Tell `tox`'ers to use `nox`'.
…3.py-fails-to-validate-ALIAS-A-records

51501 states boto3 route53.py fails to validate alias a records
@garethgreenaway garethgreenaway requested a review from saltstack/team-core Feb 22, 2019
@dwoz
dwoz approved these changes Feb 23, 2019
@dwoz dwoz merged commit 98f1b03 into saltstack:2018.3 Feb 23, 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-2017.7 branch Mar 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.