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.3 to 2018.3 #49629

Merged
merged 16 commits into from Sep 13, 2018

Conversation

Projects
None yet
4 participants
@rallytime
Copy link
Contributor

commented Sep 12, 2018

Conflicts:

  • tests/integration/states/test_file.py

Ch3LL and others added some commits Sep 5, 2018

Disable various boto tests when run under python 3.7 because of //git…
…hub.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests.
Merge pull request #49535 from Ch3LL/skip_pip_mac
Skip test_virt and pip_state requirements tests on macosx
Fix issues with osx build scripts on 2018.3.3
Upgrade openssl to 1.0.2p
Disable various boto tests when run under python 3.7 because of //git…
…hub.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests.  This PR is disabling the tests in the test_boto_vpc state tests.
Add file coding line at top of file
This was accidentally removed during a merge conflict resolution
Merge pull request #49589 from rallytime/utils-paths
Update old utils paths to use new utils paths
Merge branch '2018.3.3' into '2018.3'
Conflicts:
  - tests/integration/states/test_file.py

@rallytime rallytime merged commit e319ecc into saltstack:2018.3 Sep 13, 2018

4 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has failed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py3-ubuntu-1604 running py3-ubuntu-1604...
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details

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