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

Merged
merged 7 commits into from Oct 30, 2018

Conversation

Projects
None yet
4 participants
@rallytime
Copy link
Contributor

commented Oct 30, 2018

Conflicts:

  • salt/states/pip_state.py
  • tests/integration/cloud/clouds/test_ec2.py

gtmanfred and others added some commits Oct 29, 2018

Merge pull request #50280 from gtmanfred/2017.7
fix InstallRequirement.from_line for pip 18.1
Merge pull request #50287 from whytewolf/boto_vpc
minor correction to boto_vpc.route_table_present example
Brett Benassi
Merge pull request #50295 from dubb-b/remove-cloud-change
Removing an un needed change and maybe fixing the lint error
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/states/pip_state.py
  - tests/integration/cloud/clouds/test_ec2.py

@cachedout cachedout merged commit 84ee7a3 into saltstack:2018.3 Oct 30, 2018

8 of 10 checks passed

jenkins/pr/py2-windows-2016 running py2-windows-2016...
Details
jenkins/pr/py3-windows-2016 running py3-windows-2016...
Details
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 The lint job 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/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Oct 30, 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.