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

[fluorine] Merge forward from 2017.7 to 2018.3 #51018

Merged
merged 12 commits into from Jan 1, 2019

Conversation

Projects
None yet
7 participants
@garethgreenaway
Copy link
Member

commented Jan 1, 2019

Merge branch '2017.7' into merge-2018.3

Conflicts:

  • pkg/osx/req.txt
  • pkg/windows/req.txt

twangboy and others added some commits Nov 8, 2018

Merge pull request #50977 from rallytime/config-docs
Add documentation for a few config values
Merge branch '2017.7' into merge-2018.3
 Conflicts:
   - pkg/osx/req.txt
   - pkg/windows/req.txt

@garethgreenaway garethgreenaway requested a review from saltstack/team-core Jan 1, 2019

@s0undt3ch s0undt3ch merged commit b4774a8 into saltstack:2018.3 Jan 1, 2019

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
@LyTuan

This comment has been minimized.

Copy link

commented on 4196690 Jan 5, 2019

Can you tell me why do you update requests library? Thanks.

This comment has been minimized.

Copy link
Contributor Author

replied Jan 8, 2019

There was a CVE reported in the requests library: https://cve.mitre.org/cgi-bin/cvename.cgi?name=2018-18074

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.