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

Merged
merged 11 commits into from Jul 26, 2018

Conversation

Projects
None yet
4 participants
@rallytime
Contributor

rallytime commented Jul 24, 2018

Conflicts:

  • tests/integration/netapi/rest_tornado/test_app.py
  • tests/integration/states/test_service.py

frogunder and others added some commits Jul 19, 2018

Merge pull request #48672 from frogunder/45012
add service enabled test
Merge pull request #48715 from rallytime/flaky-tests
[2017.7] Mark some tornado tests as flaky
Merge pull request #48719 from Ch3LL/service_mac_state
Enable service if disabled before running state service tests
Merge pull request #48720 from Ch3LL/mac_file_path
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path
Update DOCBANNER with new SaltConf18 image
And remove enterprise ad
Merge pull request #48743 from rallytime/saltconf-ad-2017.7
Update DOCBANNER with new SaltConf18 image
Merge branch '2017.7' into '2018.3'
Conflicts:
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/states/test_service.py

@rallytime rallytime merged commit 6978ce5 into saltstack:2018.3 Jul 26, 2018

4 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
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/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Jul 26, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment